X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=appveyor.yml;h=75b1ccffbe78fca31b13c321b6f52f8666f8e7a3;hp=c668b3941e8370e00ac5ae4ce19ad2f1a8a787a9;hb=26810b5eaffad3fa6d320600d8ea36e2ed86ff7c;hpb=14c4201958152392941615626da5d2800c98e943

diff --git a/appveyor.yml b/appveyor.yml
index c668b3941e..75b1ccffbe 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,23 +1,24 @@
 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") {
@@ -29,30 +30,35 @@ before_build:
     - call "%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %VCVARS_PLATFORM%
     - mkdir _build
     - cd _build
-    - perl ..\Configure %TARGET% no-asm %SHARED%
+    - 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
-    - cd ..
-
-# Fake deploy script to test installation
-deploy_script:
-    - mkdir _install
-    - cd _build
-    - 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:
-    - provider: Email
-      to:
-          - openssl-commits@openssl.org
-      on_build_success: false
-      on_build_failure: true
-      on_build_status_changed: true