[experimental-ims] f72c709 Disable this test on OSX, the VM mapping is too random to get us the same address again, even with hinting.

Geoff Simmons geoff at varnish-cache.org
Mon Jan 9 21:51:59 CET 2012


commit f72c7094e338c77650aaf4e00fef9c9344c2c8ae
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Sep 20 12:28:43 2011 +0000

    Disable this test on OSX, the VM mapping is too random to get us
    the same address again, even with hinting.

diff --git a/bin/varnishtest/tests/r00962.vtc b/bin/varnishtest/tests/r00962.vtc
index faf4b4b..aa0fb10 100644
--- a/bin/varnishtest/tests/r00962.vtc
+++ b/bin/varnishtest/tests/r00962.vtc
@@ -1,5 +1,8 @@
 varnishtest "Test address remapping"
 
+# VM-remapping is to random on OSX
+feature	not-OSX
+
 server s1 {
 	rxreq 
 	txresp 
diff --git a/bin/varnishtest/vtc.c b/bin/varnishtest/vtc.c
index a034fef..3bee42a 100644
--- a/bin/varnishtest/vtc.c
+++ b/bin/varnishtest/vtc.c
@@ -492,7 +492,13 @@ cmd_feature(CMD_ARGS)
 		if (sizeof(void*) == 8 && !strcmp(av[i], "64bit"))
 			continue;
 
-		vtc_log(vl, 1, "SKIPPING test, missing feature %s", av[i]);
+		if (!strcmp(av[i], "!OSX")) {
+#if !defined(__APPLE__) || !defined(__MACH__)
+			continue;
+#endif
+		}
+
+		vtc_log(vl, 1, "SKIPPING test, missing feature: %s", av[i]);
 		vtc_stop = 1;
 		return;
 	}



More information about the varnish-commit mailing list