From: Rhys Kidd Date: Mon, 3 Aug 2015 00:44:01 +0000 (+0000) Subject: Guard two hanging tests on OS X 10.11, which otherwise prevent regression test suite... X-Git-Tag: svn/VALGRIND_3_11_0~183 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d205e0fb485de75f4e110f8558059dc25bf8d63;p=thirdparty%2Fvalgrind.git Guard two hanging tests on OS X 10.11, which otherwise prevent regression test suite from running in automated manner. n-i-bz git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15474 --- diff --git a/none/tests/res_search.vgtest b/none/tests/res_search.vgtest index 745a5ff4cc..24a35fc0d9 100644 --- a/none/tests/res_search.vgtest +++ b/none/tests/res_search.vgtest @@ -1,4 +1,4 @@ -prereq: which host >/dev/null 2>/dev/null && host www.yahoo.com > /dev/null +prereq: which host >/dev/null 2>/dev/null && host www.yahoo.com > /dev/null && ! ../../tests/os_test darwin prog: res_search args: www.yahoo.com vgopts: -q diff --git a/none/tests/resolv.vgtest b/none/tests/resolv.vgtest index e4c3de06a6..879a1743a7 100644 --- a/none/tests/resolv.vgtest +++ b/none/tests/resolv.vgtest @@ -1,4 +1,4 @@ # Disabled on Solaris because different approach needs to be taken. # There is none/tests/solaris/resolv for that purpose. -prereq: (! ../../tests/os_test solaris) +prereq: ! ../../tests/os_test solaris && ! ../../tests/os_test darwin prog: resolv