From 63d8b3a507bce2f069416d6a8b05625743b41abf Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 26 Aug 2013 09:17:55 +0200
Subject: [PATCH] runtests.pl: allow -vc point to a separate curl binary to
 verify with

The specified curl binary will then be used to verify the running
server(s) instead of the development version. This is very useful in
some cases when the development version fails to verify correctly as
then the test case may not run at all.

The actual test will still be run with the "normal" curl executable
(unless the test case specifies something differently).
---
 tests/runtests.1  |  8 ++++++--
 tests/runtests.pl | 11 +++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/tests/runtests.1 b/tests/runtests.1
index 0de38f6..cb765a6 100644
--- a/tests/runtests.1
+++ b/tests/runtests.1
@@ -49,8 +49,8 @@ default, the test script stops as soon as an error is detected.
 .IP "-bN"
 Use N as the base TCP/UDP port number on which to start the test servers.
 .IP "-c <curl>"
-Provide a custom curl binary to run the tests with. Default is the curl
-executable in the build tree.
+Provide a path to a custom curl binary to run the tests with. Default is the
+curl executable in the build tree.
 .IP "-d"
 Enable protocol debug: have the servers display protocol output.
 .IP "-e"
@@ -92,6 +92,10 @@ through everyone, which is very handy when debugging and then often in
 combination with \fI-g\fP.
 .IP "-v"
 Enable verbose output. Speaks more than default.
+.IP "-vc <curl>"
+Provide a path to a custom curl binary to run when verifying that the servers
+running are indeed our test servers. Default is the curl executable in the
+build tree.
 .SH "RUNNING TESTS"
 Many tests have conditions that must be met before the test case can run
 fine. They could depend on built-in features in libcurl or features present in
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 5c50337..15acc07 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -4433,6 +4433,16 @@ while(@ARGV) {
         $DBGCURL=$CURL=$ARGV[1];
         shift @ARGV;
     }
+    elsif ($ARGV[0] eq "-vc") {
+        # use this path to a curl used to verify servers
+
+        # Particularly useful when you introduce a crashing bug somewhere in
+        # the development version as then it won't be able to run any tests
+        # since it can't verify the servers!
+
+        $VCURL=$ARGV[1];
+        shift @ARGV;
+    }
     elsif ($ARGV[0] eq "-d") {
         # have the servers display protocol output
         $debugprotocol=1;
@@ -4538,6 +4548,7 @@ Usage: runtests.pl [options] [test selection(s)]
   -am      automake style output PASS/FAIL: [number] [name]
   -t[N]    torture (simulate memory alloc failures); N means fail Nth alloc
   -v       verbose output
+  -vc path use this curl only to verify the existing servers
   [num]    like "5 6 9" or " 5 to 22 " to run those tests only
   [!num]   like "!5 !6 !9" to disable those tests
   [keyword] like "IPv6" to select only tests containing the key word
-- 
2.7.4