Move poly1305_asm_src file information to build.info files

[openssl.git] / appveyor.yml

diff --git a/appveyor.yml b/appveyor.yml
index c668b3941e8370e00ac5ae4ce19ad2f1a8a787a9..24966c0faa5ce46f5ba49c6f048a5ca37b93b8ab 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,58 +1,66 @@
 platform:
 platform:

-    - x86

     - x64
     - x64

+    - x86

 
 environment:
 
 environment:

+    fast_finish: true

     matrix:
         - VSVER: 14
 
 configuration:
     matrix:
         - VSVER: 14
 
 configuration:

-    - plain

     - shared
     - shared

+    - plain

 
 before_build:
     - ps: >-
         If ($env:Platform -Match "x86") {
             $env:VCVARS_PLATFORM="x86"
 
 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"
         } Else {
             $env:VCVARS_PLATFORM="amd64"

-            $env:TARGET="VC-WIN64A"
+            $env:TARGET="VC-WIN64A-masm"

         }
     - ps: >-
         If ($env:Configuration -Match "shared") {
         }
     - ps: >-
         If ($env:Configuration -Match "shared") {

-            $env:SHARED=""
+            $env:SHARED="no-makedepend"

         } Else {
         } Else {

-            $env:SHARED="no-shared"
+            $env:SHARED="no-shared no-makedepend"

         }
     - ps: $env:VSCOMNTOOLS=(Get-Content ("env:VS" + "$env:VSVER" + "0COMNTOOLS"))
     - call "%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %VCVARS_PLATFORM%
     - mkdir _build
     - cd _build
         }
     - ps: $env:VSCOMNTOOLS=(Get-Content ("env:VS" + "$env:VSVER" + "0COMNTOOLS"))
     - call "%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %VCVARS_PLATFORM%
     - mkdir _build
     - cd _build

-    - perl ..\Configure %TARGET% no-asm %SHARED%
+    - perl ..\Configure %TARGET% %SHARED%
+    - perl configdata.pm --dump

     - cd ..
     - 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
 
 build_script:
     - cd _build

-    - nmake
+    - ps: >-
+        If ($env:Configuration -Match "shared" -or $env:EXTENDED_TESTS) {
+            cmd /c "nmake build_all_generated 2>&1"
+            cmd /c "nmake PERL=no-perl 2>&1"
+        }

     - cd ..
 
 test_script:
     - cd _build
     - 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 DESTDIR=..\_install 2>&1"
+        }

     - cd ..
     - cd ..

-
-notifications:
-    - provider: Email
-      to:
-          - openssl-commits@openssl.org
-      on_build_success: false
-      on_build_failure: true
-      on_build_status_changed: true