r2879 - trunk/varnish-cache/bin/varnishtest

[phk at projects.linpro.no]

Author: phk
Date: 2008-07-07 19:16:50 +0200 (Mon, 07 Jul 2008)
New Revision: 2879

Modified:
   trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
Log:
Add -badvcl for VCL code we expect the compiler to whine about.



Modified: trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_varnish.c	2008-07-07 16:33:57 UTC (rev 2878)
+++ trunk/varnish-cache/bin/varnishtest/vtc_varnish.c	2008-07-07 17:16:50 UTC (rev 2879)
@@ -310,7 +310,7 @@
  */
 
 static void
-varnish_vcl(struct varnish *v, const char *vcl)
+varnish_vcl(struct varnish *v, const char *vcl, enum cli_status_e expect)
 {
 	struct vsb *vsb;
 	enum cli_status_e u;
@@ -343,13 +343,15 @@
 	AZ(vsb_overflowed(vsb));
 
 	u = varnish_ask_cli(v, vsb_data(vsb), NULL);
-	assert(u == CLIS_OK);
-	vsb_clear(vsb);
-	vsb_printf(vsb, "vcl.use vcl%d", v->vcl_nbr);
-	vsb_finish(vsb);
-	AZ(vsb_overflowed(vsb));
-	u = varnish_ask_cli(v, vsb_data(vsb), NULL);
-	assert(u == CLIS_OK);
+	assert(u == expect);
+	if (u == CLIS_OK) {
+		vsb_clear(vsb);
+		vsb_printf(vsb, "vcl.use vcl%d", v->vcl_nbr);
+		vsb_finish(vsb);
+		AZ(vsb_overflowed(vsb));
+		u = varnish_ask_cli(v, vsb_data(vsb), NULL);
+		assert(u == CLIS_OK);
+	}
 	vsb_delete(vsb);
 }
 
@@ -466,8 +468,13 @@
 			av++;
 			continue;
 		}
+		if (!strcmp(*av, "-badvcl")) {
+			varnish_vcl(v, av[1], CLIS_PARAM);
+			av++;
+			continue;
+		}
 		if (!strcmp(*av, "-vcl")) {
-			varnish_vcl(v, av[1]);
+			varnish_vcl(v, av[1], CLIS_OK);
 			av++;
 			continue;
 		}