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
This commit is contained in:
Marc Hoersken 2021-10-29 12:04:25 +02:00
parent dd77ccd87c
commit 9121032fe3
No known key found for this signature in database
GPG key ID: 61E03CBED7BC859E
4 changed files with 4 additions and 4 deletions

View file

@ -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%"
))
)

View file

@ -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")

View file

@ -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

View file

@ -6173,6 +6173,6 @@ else {
}
}
if(($total && (($ok+$ign) != $total)) || !$total) {
if(($total && (($ok+$ign) != $total)) || !$total || $unexpected) {
exit 1;
}