From dbc33efdf66a3de1f5e49320b844b87bec6f14da Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 26 Feb 2025 11:17:12 +0100 Subject: [PATCH] try ci without -rm --- appveyor.sh | 2 +- tests/CMakeLists.txt | 2 +- tests/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.sh b/appveyor.sh index ed1bf83058..1b49eb6d90 100644 --- a/appveyor.sh +++ b/appveyor.sh @@ -145,7 +145,7 @@ if [ "${TFLAGS}" != 'skipall' ] && \ cmake --build _bld --config "${PRJ_CFG}" --target test-ci else ( - TFLAGS="-a -p !flaky -r -rm ${TFLAGS}" + TFLAGS="-a -p !flaky -r ${TFLAGS}" cd _bld/tests ./runtests.pl ) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 47b01a3fac..e7037e866d 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -107,7 +107,7 @@ curl_add_runtests(test-am "-a -am") curl_add_runtests(test-full "-a -p -r") # ~flaky means that it ignores results of tests using the flaky keyword curl_add_runtests(test-nonflaky "-a -p ~flaky ~timing-dependent") -curl_add_runtests(test-ci "-a -p ~flaky ~timing-dependent -r -rm -j20") +curl_add_runtests(test-ci "-a -p ~flaky ~timing-dependent -r -j20") curl_add_runtests(test-torture "-a -t -j20") curl_add_runtests(test-event "-a -e") diff --git a/tests/Makefile.am b/tests/Makefile.am index 46d58fed85..ac8b26cb88 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -145,7 +145,7 @@ TEST_E = -a -e TEST_NF = -a -p ~flaky ~timing-dependent # special CI target derived from nonflaky with CI-specific flags -TEST_CI = $(TEST_NF) -r -rm -j20 +TEST_CI = $(TEST_NF) -r -j20 PYTEST = pytest endif