[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  6356716ac09d94a0c85fd6e5ad12f088c54d75c0 (commit)
      from  8b0d4242404f9e5da26e7594fa0864b2df4601af (commit)


- Log -----------------------------------------------------------------
commit 6356716ac09d94a0c85fd6e5ad12f088c54d75c0
Author: Andy Polyakov <appro at openssl.org>
Date:   Thu Mar 2 14:07:45 2017 +0100

    appveyor.yml: call upon cmd to redirect stderr.
    
    If stderr is not redirected an uncatchable exception is thrown.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 appveyor.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 9c896fc..a5d05c6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -33,7 +33,8 @@ before_build:
     - perl ..\Configure %TARGET% %SHARED%
     - cd ..
     - ps: >-
-        if (-not $env:APPVEYOR_PULL_REQUEST_NUMBER -or (&git log -2 | Select-String "\[extended tests\]") ) {
+        if (-not $env:APPVEYOR_PULL_REQUEST_NUMBER`
+            -or (&git log -2 | Select-String "\[extended tests\]") ) {
             $env:EXTENDED_TESTS="yes"
         }
 
@@ -41,7 +42,7 @@ build_script:
     - ps: >-
         If ($env:Configuration -Match "shared" -or $env:EXTENDED_TESTS) {
             cd _build
-            &nmake
+            cmd /c "nmake 2>&1"
             cd ..
         }
 
@@ -50,11 +51,11 @@ test_script:
         If ($env:Configuration -Match "shared" -or $env:EXTENDED_TESTS) {
             cd _build
             if ($env:EXTENDED_TESTS) {
-                &nmake test V=1
+                cmd /c "nmake test V=1 2>&1"
                 mkdir ..\_install
-                &nmake install install_docs DESTDIR=..\_install
+                cmd /c "nmake install install_docs DESTDIR=..\_install 2>&1"
             } Else {
-                &nmake test V=1 TESTS=-test_fuzz
+                cmd /c "nmake test V=1 TESTS=-test_fuzz 2>&1"
             }
             cd ..
         }