From 1ecf0ea70ab721991a0da48efaa752bc4fe0deb0 Mon Sep 17 00:00:00 2001 From: Christopher Faulet Date: Tue, 18 Dec 2018 22:47:23 +0100 Subject: [PATCH] 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. --- scripts/run-regtests.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/run-regtests.sh b/scripts/run-regtests.sh index 7da746a74..be53e97cf 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"