[master] b2bee0e More coverage of mgt_main.c

[Poul-Henning Kamp]

commit b2bee0e30bbe2ca62f5ad98050d310fae5467c4e
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sat Jan 7 22:47:46 2017 +0000

    More coverage of mgt_main.c

diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index 889bbdb..a926401 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -746,7 +746,7 @@ main(int argc, char * const *argv)
 			av = VAV_Parse(optarg, NULL, ARGV_COMMA);
 			AN(av);
 			if (av[0] != NULL)
-				ARGV_ERR("\t-l ...: %s", av[0]);
+				ARGV_ERR("\t-l ...: %s\n", av[0]);
 			if (av[1] != NULL) {
 				MCF_ParamSet(cli, "vsl_space", av[1]);
 				cli_check(cli);
diff --git a/bin/varnishtest/tests/a00009.vtc b/bin/varnishtest/tests/a00009.vtc
index 40b0be6..46fa487 100644
--- a/bin/varnishtest/tests/a00009.vtc
+++ b/bin/varnishtest/tests/a00009.vtc
@@ -1,6 +1,6 @@
 varnishtest "Code coverage of VCL compiler and RSTdump etc"
 
-shell "varnishd -b 127.0.0.1:80 -C -n ${tmpdir} 2> /${tmpdir}/_.c"
+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"
@@ -16,3 +16,9 @@ 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 {-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}