X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=appveyor.yml;h=a5d05c6bdcdbb7174ef1de51157229885a468971;hp=7496a9b3f3335946f35a778d23d85c1c2c559f04;hb=2b305ab02e0977ed71c255cc386ff75c397d7820;hpb=f527b6e4652b0390b4b5de597af6f18f06c3de0e

diff --git a/appveyor.yml b/appveyor.yml
index 7496a9b3f3..a5d05c6bdc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,39 +1,64 @@
 platform:
-    - x86
     - x64
+    - x86
 
 environment:
+    fast_finish: true
     matrix:
         - VSVER: 14
 
 configuration:
-    - plain
     - shared
+    - plain
 
 before_build:
     - ps: >-
         If ($env:Platform -Match "x86") {
             $env:VCVARS_PLATFORM="x86"
-            $env:TARGET="VC-WIN32"
+            $env:TARGET="VC-WIN32 no-asm"
         } Else {
             $env:VCVARS_PLATFORM="amd64"
-            $env:TARGET="VC-WIN64A"
+            $env:TARGET="VC-WIN64A-masm"
         }
     - ps: >-
         If ($env:Configuration -Match "shared") {
-            $env:SHARED="shared"
-        } Else {
             $env:SHARED=""
+        } Else {
+            $env:SHARED="no-shared"
         }
     - ps: $env:VSCOMNTOOLS=(Get-Content ("env:VS" + "$env:VSVER" + "0COMNTOOLS"))
     - call "%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %VCVARS_PLATFORM%
-    - perl Configure %TARGET% no-asm %SHARED%
+    - mkdir _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:
-    - nmake
+    - ps: >-
+        If ($env:Configuration -Match "shared" -or $env:EXTENDED_TESTS) {
+            cd _build
+            cmd /c "nmake 2>&1"
+            cd ..
+        }
 
 test_script:
-    - nmake test
+    - ps: >-
+        If ($env:Configuration -Match "shared" -or $env:EXTENDED_TESTS) {
+            cd _build
+            if ($env:EXTENDED_TESTS) {
+                cmd /c "nmake test V=1 2>&1"
+                mkdir ..\_install
+                cmd /c "nmake install install_docs DESTDIR=..\_install 2>&1"
+            } Else {
+                cmd /c "nmake test V=1 TESTS=-test_fuzz 2>&1"
+            }
+            cd ..
+        }
 
 notifications:
     - provider: Email