diff options
| author | rhyskidd <rhyskidd@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2015-08-03 00:44:01 +0000 |
|---|---|---|
| committer | rhyskidd <rhyskidd@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2015-08-03 00:44:01 +0000 |
| commit | f03f9f32ec166fa871fe62f0f12216e1413ffb75 (patch) | |
| tree | 24a27e0fe969ce5b398aaae12bb92b48557facc5 /none | |
| parent | 072064dcb86f4652a87f6316dff420d55ae137db (diff) | |
| download | valgrind-f03f9f32ec166fa871fe62f0f12216e1413ffb75.tar.gz | |
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 a5019735-40e9-0310-863c-91ae7b9d1cf9
Diffstat (limited to 'none')
| -rw-r--r-- | none/tests/res_search.vgtest | 2 | ||||
| -rw-r--r-- | none/tests/resolv.vgtest | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/none/tests/res_search.vgtest b/none/tests/res_search.vgtest index 745a5ff4c..24a35fc0d 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 e4c3de06a..879a1743a 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 |