tests: provide 'manual' as a feature to optionally require

... and make test 1026 rely on that feature so that --disable-manual
builds don't cause test failures.

Reported-by: Max Dymond and Anders Roxell
Fixes #2533
Closes #2540

diff --git a/tests/FILEFORMAT b/tests/FILEFORMAT
index 19862f2a4b665abb0483b5b6193c5ef68c6dfea8..d584ac163e1c0c51d26d16cfcae799146774c96b 100644 (file)
--- a/tests/FILEFORMAT
+++ b/tests/FILEFORMAT
@@ -231,6 +231,7 @@ ipv6
 Kerberos
 large_file
 libz
+manual
 Metalink
 NSS
 NTLM

diff --git a/tests/data/test1026 b/tests/data/test1026
index e47b12a0a6948d2a2f000f4e33feba842561e3a0..bd5dc9c85cdcd6c6142a7c12d9dc101a76ad3e2b 100644 (file)
--- a/tests/data/test1026
+++ b/tests/data/test1026
@@ -13,6 +13,9 @@
 #
 # Client-side
 <client>
+<features>
+manual
+</features>
 <server>
 none
 </server>

diff --git a/tests/runtests.pl b/tests/runtests.pl
index f9172007b3f0a2a1c9a4845e26367e1b49ab2580..054c64bf336f8175b85dd48975a53cea581c60cd 100755 (executable)
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -235,6 +235,7 @@ my $has_threadedres;# set if built with threaded resolver
 my $has_psl;        # set if libcurl is built with PSL support
 my $has_ldpreload;  # set if curl is built for systems supporting LD_PRELOAD
 my $has_multissl;   # set if curl is build with MultiSSL support
+my $has_manual;     # set if curl is built with built-in manual
 
 # this version is decided by the particular nghttp2 library that is being used
 my $h2cver = "h2c";
@@ -3033,6 +3034,17 @@ sub checksystem {
             "TrackMemory feature (--enable-curldebug)";
     }
 
+    open(M, "$CURL -M 2>&1|");
+    while(my $s = <M>) {
+        if($s =~ /built-in manual was disabled at build-time/) {
+            $has_manual = 0;
+            last;
+        }
+        $has_manual = 1;
+        last;
+    }
+    close(M);
+
     $has_shared = `sh $CURLCONFIG --built-shared`;
     chomp $has_shared;
 
@@ -3472,6 +3484,11 @@ sub singletest {
                     next;
                 }
             }
+            elsif($1 eq "manual") {
+                if($has_manual) {
+                    next;
+                }
+            }
             elsif($1 eq "socks") {
                 next;
             }