Update rc2test to use the test infrastructure

[openssl.git] / appveyor.yml

diff --git a/appveyor.yml b/appveyor.yml
index 9c896fc810f228bd782301a73a7a51462cb6d834..f2eab32953e04e85a6a0f94268d6d85a4c1f501e 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -33,31 +33,35 @@ 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"
         }
 
 build_script:
+    - cd _build
     - ps: >-
         If ($env:Configuration -Match "shared" -or $env:EXTENDED_TESTS) {
-            cd _build
-            &nmake
-            cd ..
+            cmd /c "nmake 2>&1"
         }
+    - cd ..
 
 test_script:
+    - cd _build
     - 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
+                cmd /c "nmake test V=1 2>&1"
             } Else {
-                &nmake test V=1 TESTS=-test_fuzz
+                cmd /c "nmake test V=1 TESTS=-test_fuzz 2>&1"
             }
-            cd ..
         }
+    - ps: >-
+        if ($env:EXTENDED_TESTS) {
+            mkdir ..\_install
+            cmd /c "nmake install install_docs DESTDIR=..\_install 2>&1"
+        }
+    - cd ..
 
 notifications:
     - provider: Email