r3967 - in branches/2.0/varnish-cache/bin/varnishtest: . tests

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-03-20 12:08:41 +0100 (Fri, 20 Mar 2009)
New Revision: 3967

Modified:
   branches/2.0/varnish-cache/bin/varnishtest/tests/a00009.vtc
   branches/2.0/varnish-cache/bin/varnishtest/vtc.c
Log:
Merge r3826: Make sure system "..." returns successfully

We didn't check the return status of system, making failures in a00009
go unnoticed.  Fix this and fix a00009 to not fail when run
uninstalled.



Modified: branches/2.0/varnish-cache/bin/varnishtest/tests/a00009.vtc
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/tests/a00009.vtc	2009-03-20 11:03:50 UTC (rev 3966)
+++ branches/2.0/varnish-cache/bin/varnishtest/tests/a00009.vtc	2009-03-20 11:08:41 UTC (rev 3967)
@@ -2,4 +2,4 @@
 
 test "See that the VCL compiler works"
 
-shell "cd ../varnishd && ./varnishd -b 127.0.0.1:80 -C"
+shell "cd ../varnishd && ./varnishd -b 127.0.0.1:80 -C -n /tmp/__v1"

Modified: branches/2.0/varnish-cache/bin/varnishtest/vtc.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/vtc.c	2009-03-20 11:03:50 UTC (rev 3966)
+++ branches/2.0/varnish-cache/bin/varnishtest/vtc.c	2009-03-20 11:08:41 UTC (rev 3967)
@@ -246,7 +246,7 @@
 	AN(av[1]);
 	AZ(av[2]);
 	vtc_dump(vl, 4, "shell", av[1]);
-	(void)system(av[1]);	/* XXX: assert ? */
+	assert(WEXITSTATUS(system(av[1])) == 0);
 }
 
 /**********************************************************************