appveyor.yml: split {build,test}_scripts to avoid exit code masking.

[openssl.git] / appveyor.yml

diff --git a/appveyor.yml b/appveyor.yml
index d47c6cd6d7f4997fec55750601583bc619b9b3c5..f2eab32953e04e85a6a0f94268d6d85a4c1f501e 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,14 +1,15 @@
 platform:
-    - x86
     - x64
+    - x86
 
 environment:
+    fast_finish: true
     matrix:
         - VSVER: 14
 
 configuration:
-    - plain
     - shared
+    - plain
 
 before_build:
     - ps: >-
@@ -31,17 +32,35 @@ before_build:
     - cd _build
     - perl ..\Configure %TARGET% %SHARED%
     - cd ..
+    - ps: >-
+        if (-not $env:APPVEYOR_PULL_REQUEST_NUMBER`
+            -or (&git log -2 | Select-String "\[extended tests\]") ) {
+            $env:EXTENDED_TESTS="yes"
+        }
 
 build_script:
     - cd _build
-    - nmake
+    - ps: >-
+        If ($env:Configuration -Match "shared" -or $env:EXTENDED_TESTS) {
+            cmd /c "nmake 2>&1"
+        }
     - cd ..
 
 test_script:
     - cd _build
-    - nmake test V=1
-    - mkdir ..\_install
-    - nmake install install_docs DESTDIR=..\_install
+    - ps: >-
+        If ($env:Configuration -Match "shared" -or $env:EXTENDED_TESTS) {
+            if ($env:EXTENDED_TESTS) {
+                cmd /c "nmake test V=1 2>&1"
+            } Else {
+                cmd /c "nmake test V=1 TESTS=-test_fuzz 2>&1"
+            }
+        }
+    - ps: >-
+        if ($env:EXTENDED_TESTS) {
+            mkdir ..\_install
+            cmd /c "nmake install install_docs DESTDIR=..\_install 2>&1"
+        }
     - cd ..
 
 notifications: