CI: ignore the "flaky" and "timing-dependent" test results in CMake

This was already done for automake builds but CMake builds were missed.
Test 1086 actually causes the test harness to crash with:

Warning: unable to close filehandle DWRITE properly: Broken pipe at C:/projects/curl/tests/ftpserver.pl line 527

Rather than fix it now, this change leaves test 1086 entirely skipped on
those builds that show this problem.

Follow-up to 589dca761

Ref: #11865

diff --git a/appveyor.yml b/appveyor.yml
index 1dd58257200434dff88129e36724ffad3474179b..65822cbde35412300c1f795ca43138d035527aa2 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -130,7 +130,7 @@ environment:
       ENABLE_UNICODE: 'ON'
       HTTP_ONLY: 'OFF'
       TESTING: 'ON'
-      DISABLED_TESTS: '!1139 !1451 !1501'
+      DISABLED_TESTS: '!1086 !1139 !1451 !1501'
       ADD_PATH: 'C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;C:\msys64\usr\bin'
       MSYS2_ARG_CONV_EXCL: '/*'
       BUILD_OPT: -k
@@ -144,7 +144,7 @@ environment:
       ENABLE_UNICODE: 'ON'
       HTTP_ONLY: 'OFF'
       TESTING: 'ON'
-      DISABLED_TESTS: '!1139 !1451 !1501'
+      DISABLED_TESTS: '!1086 !1139 !1451 !1501'
       ADD_PATH: 'C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin;C:\msys64\usr\bin'
       MSYS2_ARG_CONV_EXCL: '/*'
       BUILD_OPT: -k
@@ -157,7 +157,7 @@ environment:
       ENABLE_UNICODE: 'OFF'
       HTTP_ONLY: 'OFF'
       TESTING: 'ON'
-      DISABLED_TESTS: '!1139 !1451 !1501'
+      DISABLED_TESTS: '!1086 !1139 !1451 !1501'
       ADD_PATH: 'C:\msys64\mingw64\bin;C:\msys64\usr\bin'
       MSYS2_ARG_CONV_EXCL: '/*'
       BUILD_OPT: -k
@@ -171,7 +171,7 @@ environment:
       ENABLE_UNICODE: 'OFF'
       HTTP_ONLY: 'OFF'
       TESTING: 'ON'
-      DISABLED_TESTS: '!1139 !1451 !1501'
+      DISABLED_TESTS: '!1086 !1139 !1451 !1501'
       ADD_PATH: 'C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin;C:\msys64\usr\bin'
       MSYS2_ARG_CONV_EXCL: '/*'
       BUILD_OPT: -k

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 20bb5336716602372b818f184160163118314ebd..82c6511671972f317269831003b8aa339d2e3746 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -48,8 +48,8 @@ endfunction()
 add_runtests(test-quiet     "-a -s")
 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")
+# ~flaky means that it'll ignore results of tests using the flaky keyword
+add_runtests(test-nonflaky  "-a -p ~flaky ~timing-dependent")
+add_runtests(test-ci        "-a -p ~flaky ~timing-dependent -r -rm")
 add_runtests(test-torture   "-a -t")
 add_runtests(test-event     "-a -e")