[master] 0de1ebe Enable -N option in VUT

Martin Blix Grydeland martin at varnish-cache.org
Thu Oct 10 16:48:39 CEST 2013


commit 0de1ebe013ae87c65fe85d563fc8a60eedae0e5f
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Thu Oct 10 12:26:03 2013 +0200

    Enable -N option in VUT

diff --git a/lib/libvarnishapi/libvarnishapi.map b/lib/libvarnishapi/libvarnishapi.map
index 8862129..34f3851 100644
--- a/lib/libvarnishapi/libvarnishapi.map
+++ b/lib/libvarnishapi/libvarnishapi.map
@@ -117,5 +117,6 @@ LIBVARNISHAPI_1.3 {
 	VSLQ_Name2Grouping;
 	VSL_Glob2Tags;
 	VSL_List2Tags;
+	VSM_N_Arg;
 	# Variables:
 } LIBVARNISHAPI_1.0;
diff --git a/lib/libvarnishtools/vut.c b/lib/libvarnishtools/vut.c
index d318c45..709b6bd 100644
--- a/lib/libvarnishtools/vut.c
+++ b/lib/libvarnishtools/vut.c
@@ -139,6 +139,15 @@ VUT_Arg(int opt, const char *arg)
 		if (VSM_n_Arg(VUT.vsm, arg) <= 0)
 			VUT_Error(1, "%s", VSM_Error(VUT.vsm));
 		return (1);
+	case 'N':
+		/* Varnish stale VSM file */
+		if (VUT.vsm == NULL)
+			VUT.vsm = VSM_New();
+		AN(VUT.vsm);
+		if (VSM_N_Arg(VUT.vsm, arg) <= 0)
+			VUT_Error(1, "%s", VSM_Error(VUT.vsm));
+		VUT.d_opt = 1;	/* Enforces -d */
+		return (1);
 	case 'P':
 		/* PID file */
 		REPLACE(VUT.P_arg, arg);



More information about the varnish-commit mailing list