[master] cd8437c Polish

Federico G. Schwindt fgsch at lodoss.net
Sun Jan 8 12:06:05 CET 2017


commit cd8437c633f0ccbfd411c459164906a4513aa265
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Sun Jan 8 10:50:20 2017 +0000

    Polish

diff --git a/bin/varnishtest/tests/a00009.vtc b/bin/varnishtest/tests/a00009.vtc
index 46fa487..f78916d 100644
--- a/bin/varnishtest/tests/a00009.vtc
+++ b/bin/varnishtest/tests/a00009.vtc
@@ -1,11 +1,17 @@
 varnishtest "Code coverage of VCL compiler and RSTdump etc"
 
-shell "varnishd -b 127.0.0.1:80 -C 2> /${tmpdir}/_.c"
-shell "varnishd -x dumprstparam > /${tmpdir}/_.param"
-shell "varnishd -x dumprstvsl > /${tmpdir}/_.vsl"
-shell "varnishd -x dumprstcli > /${tmpdir}/_.cli"
-err_shell {VCL version declaration missing} "echo 'bad vcl' >${tmpdir}/t.vcl ; varnishd -f ${tmpdir}/t.vcl -n ${tmpdir} 2>&1"
-err_shell {VCL version declaration missing} "echo 'bad vcl' >${tmpdir}/t.vcl ; varnishd -C -f ${tmpdir}/t.vcl -n ${tmpdir} 2>&1"
+shell "varnishd -b 127.0.0.1:80 -C 2> ${tmpdir}/_.c"
+shell "varnishd -x dumprstparam > ${tmpdir}/_.param"
+shell "varnishd -x dumprstvsl > ${tmpdir}/_.vsl"
+shell "varnishd -x dumprstcli > ${tmpdir}/_.cli"
+err_shell {VCL version declaration missing} {
+	echo 'bad vcl' > ${tmpdir}/t.vcl
+	varnishd -f ${tmpdir}/t.vcl -n ${tmpdir} 2>&1
+}
+err_shell {VCL version declaration missing} {
+	echo 'bad vcl' > ${tmpdir}/t.vcl
+	varnishd -C -f ${tmpdir}/t.vcl -n ${tmpdir} 2>&1
+}
 err_shell {-spersistent has been deprecated} "varnishd -spersistent 2>&1"
 err_shell {Unknown jail method "xyz"} "varnishd -jxyz 2>&1"
 err_shell {-x is incompatible with everything else} "varnishd -d -x foo 2>&1"
@@ -13,12 +19,13 @@ err_shell {Invalid -x argument} "varnishd -x foo 2>&1"
 err_shell {Too many arguments} "varnishd foo 2>&1"
 err_shell {Only one of -d or -F can be specified} "varnishd -d -F 2>&1"
 err_shell {Only one of -b or -f can be specified} "varnishd -b a -f b 2>&1"
-err_shell {-C needs either -b <backend> or -f <vcl_file>} "varnishd -C 2>&1"
+err_shell {-C needs either -b <backend> or -f <vcl_file>} \
+	"varnishd -C 2>&1"
 err_shell {-d makes no sense with -C} "varnishd -C -b 127.0.0.1:80 -d 2>&1"
 err_shell {-F makes no sense with -C} "varnishd -C -b 127.0.0.1:80 -F 2>&1"
 err_shell {usage: varnishd [options]} "varnishd -h 2>&1"
 err_shell {usage: varnishd [options]} "varnishd -? 2>&1"
 err_shell {Invalid backslash sequence} {varnishd -l 'xyz\kk,xyz\foo' 2>&1}
 err_shell {Invalid backslash sequence} {varnishd -l 'ab\8cd' 2>&1}
-err_shell {Copyright (c) 2006} {varnishd -V 2>&1}
-err_shell {Cannot open -S file (/nonexistent)} {varnishd -S /nonexistent 2>&1}
+err_shell {Copyright (c) 2006} "varnishd -V 2>&1"
+err_shell {Cannot open -S file (/nonexistent)} "varnishd -S /nonexistent 2>&1"



More information about the varnish-commit mailing list