When varnishtest is invoked with -l/-L, don't delete VMOD shared obje…

…cts.
varnishcache · Apr 20, 2017 · d851560 · d851560
1 parent 6ab9e9c
commit d851560
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/bin/varnishtest/tests/m00008.vtc b/bin/varnishtest/tests/m00008.vtc
@@ -47,6 +47,10 @@ varnish v1 -errvcl {Malformed VMOD std} {
 # Check creation and cleanup of copied shared objects for VMODs
 shell "test -e ./v1/vmod_cache/_vmod_std.*"
 
+# In case varnishtest was invoked with -L or -l, in which case the
+# bit is switched on.
+varnish v1 -cliok "param.set debug -vmod_so_keep"
+
 varnish v1 -stop
 varnish v1 -cleanup
 shell -err "test -e ./v1/vmod_cache/_vmod_std.*"
diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
@@ -418,8 +418,10 @@ varnish_launch(struct varnish *v)
 	VSB_cat(vsb, VSB_data(params_vsb));
 	if (vtc_witness)
 		VSB_cat(vsb, " -p debug=+witness");
-	if (leave_temp)
+	if (leave_temp) {
 		VSB_cat(vsb, " -p debug=+vsm_keep");
+		VSB_cat(vsb, " -p debug=+vmod_so_keep");
+        }
 	VSB_printf(vsb, " -l 2m,1m,-");
 	VSB_printf(vsb, " -p auto_restart=off");
 	VSB_printf(vsb, " -p syslog_cli_traffic=off");