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 9cfa67b03b51559d7211a7afdfa8529ec0550bf7..149da9414584a60c50d08e4325497e70a4725d1b 100644 (file)
--- 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 70a153385934018ebd5d52a000f3c71eaa7e6598..5771bd2c9fd53c1ef6f4df3a27384d4caf5d44b1 100644 (file)
--- 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 5022ec1172b58a14a704d126c1c08b4e4c4beaae..7c64981838f77c30be2ed22a11f04f9dc73e71dc 100644 (file)
--- 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 a8d597ccc8aaea2dd3d7f0955a2cd32e88a4d246..8b3ba67d84dc275e7a075cb33af2b1c87b070fba 100755 (executable)
--- 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;
 }