[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  fd74aba83652a8410a74b59de0b098232af74e33 (commit)
       via  28443085c771309898b3f4f36f3e79802c59723d (commit)
      from  45632ee3bb7ab4ed405d5251d76dd5b94d782adb (commit)


- Log -----------------------------------------------------------------
commit fd74aba83652a8410a74b59de0b098232af74e33
Author: Andy Polyakov <appro at openssl.org>
Date:   Wed Mar 1 14:33:34 2017 +0100

    appveyor.yml: streamline pull requests.
    
    For pull requests not tagged with [extended tests]:
    
    - short-curcuit most expensive fuzz and install tests;
    - skip over non-shared builds;
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2810)

commit 28443085c771309898b3f4f36f3e79802c59723d
Author: Andy Polyakov <appro at openssl.org>
Date:   Wed Mar 1 14:32:25 2017 +0100

    Configurations/50-masm.conf: add /nologo to ml64 command line.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2810)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/50-masm.conf |  2 +-
 appveyor.yml                | 35 +++++++++++++++++++++++++----------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/Configurations/50-masm.conf b/Configurations/50-masm.conf
index 84cf2f1..0ec5e95 100644
--- a/Configurations/50-masm.conf
+++ b/Configurations/50-masm.conf
@@ -12,7 +12,7 @@
         inherit_from    => [ "VC-WIN64-common", asm("x86_64_asm"),
                              sub { $disabled{shared} ? () : "x86_64_uplink" } ],
         as              => "ml64",
-        asflags         => "/c /Cp /Cx /Zi",
+        asflags         => "/nologo /c /Cp /Cx /Zi",
         asoutflag       => "/Fo",
         sys_id          => "WIN64A",
         bn_asm_src      => sub { return undef unless @_;
diff --git a/appveyor.yml b/appveyor.yml
index d47c6cd..9c896fc 100644
--- 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,18 +32,32 @@ 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
-    - cd ..
+    - ps: >-
+        If ($env:Configuration -Match "shared" -or $env:EXTENDED_TESTS) {
+            cd _build
+            &nmake
+            cd ..
+        }
 
 test_script:
-    - cd _build
-    - nmake test V=1
-    - mkdir ..\_install
-    - nmake install install_docs DESTDIR=..\_install
-    - cd ..
+    - ps: >-
+        If ($env:Configuration -Match "shared" -or $env:EXTENDED_TESTS) {
+            cd _build
+            if ($env:EXTENDED_TESTS) {
+                &nmake test V=1
+                mkdir ..\_install
+                &nmake install install_docs DESTDIR=..\_install
+            } Else {
+                &nmake test V=1 TESTS=-test_fuzz
+            }
+            cd ..
+        }
 
 notifications:
     - provider: Email