[master] 43b009a Teach varnishtest about VRE_NOTEMPTY_ATSTART and skip c00047 which just hangs if we don't have it
Poul-Henning Kamp
phk at varnish-cache.org
Sun Nov 13 10:46:15 CET 2011
commit 43b009a8454f18c7aaaa211b19d2e54004dce24e
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Sun Nov 13 09:45:49 2011 +0000
Teach varnishtest about VRE_NOTEMPTY_ATSTART and skip c00047
which just hangs if we don't have it
diff --git a/bin/varnishtest/tests/c00047.vtc b/bin/varnishtest/tests/c00047.vtc
index 4b23194..dd1d256 100644
--- a/bin/varnishtest/tests/c00047.vtc
+++ b/bin/varnishtest/tests/c00047.vtc
@@ -1,5 +1,7 @@
varnishtest "Test VCL regsuball()"
+feature VRE_NOTEMPTY_ATSTART
+
server s1 {
rxreq
txresp \
diff --git a/bin/varnishtest/vtc.c b/bin/varnishtest/vtc.c
index 9581b3c..d6c3b35 100644
--- a/bin/varnishtest/vtc.c
+++ b/bin/varnishtest/vtc.c
@@ -43,6 +43,7 @@
#include "vtc.h"
#include "vav.h"
+#include "vre.h"
#include "vtim.h"
@@ -494,6 +495,9 @@ cmd_feature(CMD_ARGS)
continue;
#endif
}
+ if (!strcmp(av[i], "VRE_NOTEMPTY_ATSTART") &&
+ VRE_NOTEMPTY_ATSTART)
+ continue;
vtc_log(vl, 1, "SKIPPING test, missing feature: %s", av[i]);
vtc_stop = 1;
More information about the varnish-commit
mailing list