From c1e8744177c78b150c78d376ecb1f9aa0a7cfb08 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 25 Nov 2014 10:36:47 +0100
Subject: testcurl: skip reading the setup file if given enough cmdline info

This makes it much easier to run multiple tests in the same directory,
just altering the command lines used.
---
 tests/testcurl.pl | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'tests/testcurl.pl')

diff --git a/tests/testcurl.pl b/tests/testcurl.pl
index e814cd599..26af79366 100755
--- a/tests/testcurl.pl
+++ b/tests/testcurl.pl
@@ -258,7 +258,13 @@ sub get_host_triplet {
   return $triplet;
 }
 
-if (open(F, "$setupfile")) {
+if($name && $email && $desc) {
+  # having these fields set are enough to continue, skip reading the setup
+  # file
+  $infixed=4;
+  $fixed=4;
+}
+elsif (open(F, "$setupfile")) {
   while (<F>) {
     if (/(\w+)=(.*)/) {
       eval "\$$1=$2;";
@@ -266,7 +272,8 @@ if (open(F, "$setupfile")) {
   }
   close(F);
   $infixed=$fixed;
-} else {
+}
+else {
   $infixed=0;    # so that "additional args to configure" works properly first time...
 }
 
-- 
cgit v1.2.3