From: Dr. David von Oheimb <David.von.Oheimb@siemens.com>
Date: Tue, 1 Dec 2020 07:52:33 +0000 (+0100)
Subject: appveyor.yml: Let 'nmake' run by defaut silently (/S), using MAKEVERBOSE like .travis.yml
X-Git-Tag: openssl-3.0.0-alpha10~191
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0386bf820884ebe192e8343d3e91324da97de29b;p=thirdparty%2Fopenssl.git

appveyor.yml: Let 'nmake' run by defaut silently (/S), using MAKEVERBOSE like .travis.yml

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13580)
---

diff --git a/appveyor.yml b/appveyor.yml
index 3ac6d12e269..c3d070fc539 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -50,13 +50,19 @@ before_build:
                  Select-String "\[extended tests\]") ) {
             $env:EXTENDED_TESTS="yes"
         }
+    - ps: >-
+        If ($env:BUILDONLY -or $env:MAKEVERBOSE) {
+            $env:NMAKE="nmake"
+        } Else {
+            $env:NMAKE="nmake /S"
+        }
 
 build_script:
     - cd _build
     - 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"
+            cmd /c "%NMAKE% build_all_generated 2>&1"
+            cmd /c "%NMAKE% PERL=no-perl 2>&1"
         }
     - cd ..
 
@@ -65,14 +71,14 @@ test_script:
     - ps: >-
         If ($env:Configuration -Match "shared" -or $env:EXTENDED_TESTS) {
             if ($env:EXTENDED_TESTS) {
-                cmd /c "nmake test HARNESS_VERBOSE_FAILURE=yes 2>&1"
+                cmd /c "%NMAKE% test HARNESS_VERBOSE_FAILURE=yes 2>&1"
             } Else {
-                cmd /c "nmake test HARNESS_VERBOSE_FAILURE=yes TESTS=-test_fuzz 2>&1"
+                cmd /c "%NMAKE% test HARNESS_VERBOSE_FAILURE=yes TESTS=-test_fuzz 2>&1"
             }
         }
     - ps: >-
         if ($env:EXTENDED_TESTS) {
             mkdir ..\_install
-            cmd /c "nmake install DESTDIR=..\_install 2>&1"
+            cmd /c "%NMAKE% install DESTDIR=..\_install 2>&1"
         }
     - cd ..