Fix BZ 339789. /bin/true does not exist on Darwin.

Patch by rhyskidd@gmail.com.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14645

diff --git a/NEWS b/NEWS
index b9edeed5909bd452f501313ef18844e71a69dec8..c99ed3092bf47f45e1eb2d07f6feb490d9829658 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -43,6 +43,7 @@ where XXXXXX is the bug number as listed below.
        tronical and pushfpopf tests)
 
 339721 assertion 'check_sibling == sibling' failed in readdwarf3.c ...
+339789 Fix none/tests/execve test on Mac OS X 10.9
 339808 Fix none/tests/rlimit64_nofile test on Mac OS X 10.9
 339853 arm64 times syscall unknown
 339855 arm64 unhandled getsid/setsid syscalls

diff --git a/none/tests/execve.c b/none/tests/execve.c
index aba252967d4eac46ec9ac289f2c62fa0e00a1be6..e6a30444ada81ebfcc04560f28126f6565bc0f00 100644 (file)
--- a/none/tests/execve.c
+++ b/none/tests/execve.c
@@ -8,7 +8,11 @@ int main(int argc, char **argv)
    {
       // This tests the case where argv and envp are NULL, which is easy to
       // get wrong because it's an unusual case.
+#  if !defined(VGO_darwin)
       if (execve("/bin/true", NULL, NULL) < 0)
+#  else
+      if (execve("/usr/bin/true", NULL, NULL) < 0)          
+#  endif
       {
          perror("execve");
          exit(1);