[4.1] 3f1dacd use debug=+vsm_keep with leave_temp (varnishtest -L / -l options)

[Nils Goroll]

commit 3f1dacddf73294b1d6424196ecec74f4b46cf7f9
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Tue Jul 14 04:07:24 2015 +0200

    use debug=+vsm_keep with leave_temp (varnishtest -L / -l options)

diff --git a/bin/varnishtest/vtc_main.c b/bin/varnishtest/vtc_main.c
index ce50c6b..df8787c 100644
--- a/bin/varnishtest/vtc_main.c
+++ b/bin/varnishtest/vtc_main.c
@@ -85,9 +85,9 @@ static int vtc_continue;		/* Continue on error */
 static int vtc_verbosity = 1;		/* Verbosity Level */
 static int vtc_good;
 static int vtc_fail;
-static int leave_temp;
 static char *tmppath;
 static char *cwd = NULL;
+int leave_temp;
 int vtc_witness = 0;
 
 /**********************************************************************
diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
index ce666e3..05ee65b 100644
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@ -52,6 +52,8 @@
 #include "vtcp.h"
 #include "vtim.h"
 
+extern int leave_temp;
+
 struct varnish {
 	unsigned		magic;
 #define VARNISH_MAGIC		0x208cd8e3
@@ -396,6 +398,8 @@ varnish_launch(struct varnish *v)
 	    v->jail, v->workdir);
 	if (vtc_witness)
 		VSB_cat(vsb, " -p debug=+witness");
+	if (leave_temp)
+		VSB_cat(vsb, " -p debug=+vsm_keep");
 	VSB_printf(vsb, " -l 2m,1m,-");
 	VSB_printf(vsb, " -p auto_restart=off");
 	VSB_printf(vsb, " -p syslog_cli_traffic=off");