runtests: allow skipping tests on torture, use for test 357

Some tests may take a long time in torture mode. Make it possible
to skip individual tests when runtests in running in torture mode.

Also:
- skip test 357 for the reason above.
  Saved 1-3 minutes for the Linux CI torture job, 1-1.5m on Windows.
  No savings on macOS.

Reported-by: Stefan Eissing
Fixes #21873

Closes #21906

diff --git a/docs/tests/FILEFORMAT.md b/docs/tests/FILEFORMAT.md
index 26e32ecd7fa9d4cd3618806102d32e6c05f00083..0518be11fd7dbc23fc0c00595407890e00888ba0 100644 (file)
--- a/docs/tests/FILEFORMAT.md
+++ b/docs/tests/FILEFORMAT.md
@@ -539,6 +539,7 @@ Features testable here are:
 - `SSPI`
 - `threaded-resolver`
 - `TLS-SRP`
+- `torture` - if runtests is running in memory test mode
 - `TrackMemory`
 - `typecheck`
 - `threadsafe`

diff --git a/docs/tests/TEST-SUITE.md b/docs/tests/TEST-SUITE.md
index 51a3f20b22880cda14385ad9c404d8a63223f808..6856eb5f8a2169a269997454a4baca3171ffd636 100644 (file)
--- a/docs/tests/TEST-SUITE.md
+++ b/docs/tests/TEST-SUITE.md
@@ -188,6 +188,9 @@ that memory leaks do not occur even in those situations. It can help to
 compile curl with `CPPFLAGS=-DMEMDEBUG_LOG_SYNC` when using this option, to
 ensure that the memory log file is properly written even if curl crashes.
 
+If a specific test takes a long time to run in memory test mode, you can
+disable it individually by adding `!torture` to its `<features>` section.
+
 ### Debug
 
 If a test case fails, you can conveniently get the script to invoke the

diff --git a/tests/data/test357 b/tests/data/test357
index a763fd22556da584773188acca182a39feb960cc..c6b11bd83c75957f15126a86c6eb013f98a492f7 100644 (file)
--- a/tests/data/test357
+++ b/tests/data/test357
@@ -48,6 +48,9 @@ no-expect
 <server>
 http
 </server>
+<features>
+!torture
+</features>
 <name>
 HTTP PUT with Expect: 100-continue and 417 response
 </name>

diff --git a/tests/runtests.pl b/tests/runtests.pl
index cd0572a59e17116943a93d554c4ee76c39cce825..a8072e32cd9334682216cc282653157c4f1e782b 100755 (executable)
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -759,6 +759,10 @@ sub checksystemfeatures {
         }
     }
 
+    if($torture) {
+        $feature{"torture"} = 1;
+    }
+
     if(!$curl) {
         logmsg "unable to get curl's version, further details are:\n";
         logmsg "issued command: \n";