From: Christopher Faulet <cfaulet@haproxy.com>
Date: Tue, 18 Dec 2018 21:47:23 +0000 (+0100)
Subject: REGTEST: script: Evaluate the varnishtest command to allow quoted parameters
X-Git-Tag: v2.0-dev0~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ecf0ea70ab721991a0da48efaa752bc4fe0deb0;p=thirdparty%2Fhaproxy.git

REGTEST: script: Evaluate the varnishtest command to allow quoted parameters

Instead of directly executing varnishtest command, we use a variable to build
the command line and we execute it with the 'eval' builtin. This way it is
possible to have quoted parameters. For instance:

  > ./scripts/run-regtests.sh --varnishtestparams "-Dmacro='some value' -n 10"

And the variable 'varnishtestparams' is also move at the end of the command
line, just before the list of test files. So it is possible to override all
default varnish options set by the script.
---

diff --git a/scripts/run-regtests.sh b/scripts/run-regtests.sh
index 7da746a74e..be53e97cfd 100755
--- a/scripts/run-regtests.sh
+++ b/scripts/run-regtests.sh
@@ -369,7 +369,8 @@ if [ -n "$testlist" ]; then
   if [ -n "$jobcount" ]; then
     jobcount="-j $jobcount"
   fi
-  $VARNISHTEST_PROGRAM $varnishtestparams $verbose $jobcount -l -k -t 10 $testlist
+  cmd="$VARNISHTEST_PROGRAM -l -k -t 10 $verbose $jobcount $varnishtestparams $testlist"
+  eval $cmd
   _vtresult=$?
 else
   echo "No tests found that meet the required criteria"