[master] a1dc310a1 We have cmd for a while so drop !osx
Federico G. Schwindt
fgsch at lodoss.net
Sun May 5 16:35:07 UTC 2019
commit a1dc310a10303bf5a7aceba9557453724ae5e4a6
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date: Sun May 5 17:11:30 2019 +0100
We have cmd for a while so drop !osx
diff --git a/bin/varnishtest/tests/r00962.vtc b/bin/varnishtest/tests/r00962.vtc
index 84f5eea23..91c093075 100644
--- a/bin/varnishtest/tests/r00962.vtc
+++ b/bin/varnishtest/tests/r00962.vtc
@@ -5,7 +5,7 @@ feature persistent_storage
feature disable_aslr
# VM-remapping is too random on OSX
-feature !OSX
+feature cmd {test $(uname) != "Darwin"}
# Same on some hardened Linux
feature cmd "test ! -c /dev/grsec"
diff --git a/bin/varnishtest/vtc_misc.c b/bin/varnishtest/vtc_misc.c
index e496de120..69c1c2c75 100644
--- a/bin/varnishtest/vtc_misc.c
+++ b/bin/varnishtest/vtc_misc.c
@@ -382,8 +382,6 @@ dns_works(void)
* The SO_RCVTIMEO socket option is working
* 64bit
* The environment is 64 bits
- * !OSX
- * The environment is not OSX
* dns
* DNS lookups are working
* topbuild
@@ -449,13 +447,6 @@ cmd_feature(CMD_ARGS)
#endif
}
- if (!strcmp(*av, "!OSX")) {
-#if !defined(__APPLE__) || !defined(__MACH__)
- good = 1;
-#else
- vtc_stop = 2;
-#endif
- }
FEATURE("pcre_jit", VRE_has_jit);
FEATURE("64bit", sizeof(void*) == 8);
FEATURE("dns", dns_works());
More information about the varnish-commit
mailing list