[prev in list] [next in list] [prev in thread] [next in thread] 

List:       varnish-dev
Subject:    [PATCH 2/2] use feature=+vsm_keep with leave_temp (varnishtest -L /, -l options)
From:       Nils Goroll <slink () schokola ! de>
Date:       2015-07-12 21:12:43
Message-ID: 55A2D84B.6040406 () schokola ! de
[Download RAW message or body]

["0002-use-feature-vsm_keep-with-leave_temp-varnishtest-L-l.patch" (text/x-patch)]

From 4800eb39330dec23fccd0376cb368862e5f6fcda Mon Sep 17 00:00:00 2001
From: Nils Goroll <nils.goroll@uplex.de>
Date: Sun, 12 Jul 2015 23:10:42 +0200
Subject: [PATCH 2/2] use feature=+vsm_keep with leave_temp (varnishtest -L /
 -l options)

---
 bin/varnishtest/vtc_main.c    | 2 +-
 bin/varnishtest/vtc_varnish.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

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..090da33 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 feature=+vsm_keep");
 	VSB_printf(vsb, " -l 2m,1m,-");
 	VSB_printf(vsb, " -p auto_restart=off");
 	VSB_printf(vsb, " -p syslog_cli_traffic=off");
-- 
2.1.4



_______________________________________________
varnish-dev mailing list
varnish-dev@varnish-cache.org
https://www.varnish-cache.org/lists/mailman/listinfo/varnish-dev

[prev in list] [next in list] [prev in thread] [next in thread]