From: Marc Hoersken <info@marc-hoersken.de>
Date: Fri, 29 Oct 2021 10:04:25 +0000 (+0200)
Subject: CI/runtests.pl: restore -u flag, but remove it from CI runs
X-Git-Tag: curl-7_80_0~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9121032fe3ee8cbe811985f3d50b79d94edbeb7d;p=thirdparty%2Fcurl.git

CI/runtests.pl: restore -u flag, but remove it from CI runs

This makes it possible to use -u again for local testing,
but removes the flag from CI config files and make targets.

Reviewed-by: Daniel Stenberg

Partially reverts #7841
Closes #7921
---

diff --git a/appveyor.yml b/appveyor.yml
index 9cfa67b03b..149da94145 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -305,7 +305,7 @@ test_script:
         if %BUILD_SYSTEM%==autotools (
           bash.exe -e -l -c "cd /c/projects/curl && make V=1 TFLAGS='%DISABLED_TESTS%' test-ci"
         ) else (
-          bash.exe -e -l -c "cd /c/projects/curl/tests && ./runtests.pl -a -p !flaky -r -rm -u %DISABLED_TESTS%"
+          bash.exe -e -l -c "cd /c/projects/curl/tests && ./runtests.pl -a -p !flaky -r -rm %DISABLED_TESTS%"
         ))
       )
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 70a1533859..5771bd2c9f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -46,6 +46,6 @@ add_runtests(test-am        "-a -am")
 add_runtests(test-full      "-a -p -r")
 # !flaky means that it'll skip all tests using the flaky keyword
 add_runtests(test-nonflaky  "-a -p !flaky")
-add_runtests(test-ci        "-a -p !flaky -r -rm -u")
+add_runtests(test-ci        "-a -p !flaky -r -rm")
 add_runtests(test-torture   "-a -t")
 add_runtests(test-event     "-a -e")
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5022ec1172..7c64981838 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -73,7 +73,7 @@ TEST_E = -a -e
 TEST_NF = -a -p !flaky
 
 # special CI target derived from nonflaky with CI-specific flags
-TEST_CI = $(TEST_NF) -r -rm -u
+TEST_CI = $(TEST_NF) -r -rm
 endif
 
 # make sure that PERL is pointing to an executable
diff --git a/tests/runtests.pl b/tests/runtests.pl
index a8d597ccc8..8b3ba67d84 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -6173,6 +6173,6 @@ else {
     }
 }
 
-if(($total && (($ok+$ign) != $total)) || !$total) {
+if(($total && (($ok+$ign) != $total)) || !$total || $unexpected) {
     exit 1;
 }