Simplify AppVeyor configuration

Adjust the stuff we are building and testing in various
configurations to trim the run time a little bit.

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15087)

diff --git a/appveyor.yml b/appveyor.yml
index 20d81c1b12d6b187a0c7f201f467a48ddd4a4c02..9bb6f04e0a44cb0df6c81e4bc373fb61f7cc69ac 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -15,15 +15,6 @@ configuration:
     - minimal
 
 for:
-    -
-        only_commits:
-            message: /\[extended tests\]/
-        configuration:
-            - shared
-            - plain
-            - minimal
-        environment:
-            EXTENDED_TESTS: yes
     -
         branches:
             only:
@@ -32,8 +23,6 @@ for:
             - shared
             - plain
             - minimal
-        environment:
-            EXTENDED_TESTS: yes
 
 before_build:
     - ps: >-
@@ -50,11 +39,11 @@ before_build:
         }
     - ps: >-
         If ($env:Configuration -Match "shared") {
-            $env:CONFIG_OPTS=""
+            $env:CONFIG_OPTS="enable-fips"
         } ElseIf ($env:Configuration -Match "minimal") {
             $env:CONFIG_OPTS="no-bulk no-asm -DOPENSSL_SMALL_FOOTPRINT"
         } Else {
-            $env:CONFIG_OPTS="no-shared"
+            $env:CONFIG_OPTS="no-fips no-shared"
         }
     - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %VCVARS_PLATFORM%
     - mkdir _build
@@ -80,13 +69,13 @@ build_script:
 test_script:
     - cd _build
     - ps: >-
-        if ($env:EXTENDED_TESTS) {
+        if ($env:Configuration -Match "plain") {
             cmd /c "%NMAKE% test VERBOSE_FAILURE=yes 2>&1"
         } Else {
             cmd /c "%NMAKE% test VERBOSE_FAILURE=yes TESTS=-test_fuzz 2>&1"
         }
     - ps: >-
-        if ($env:EXTENDED_TESTS) {
+        if ($env:Configuration -Match "shared") {
             mkdir ..\_install
             cmd /c "%NMAKE% install DESTDIR=..\_install 2>&1"
         }