[compiler-rt] r217753 - [asan] Disable wait4 test on Android.

[Evgeniy Stepanov]

Author: eugenis
Date: Mon Sep 15 04:20:15 2014
New Revision: 217753

URL: http://llvm.org/viewvc/llvm-project?rev=217753&view=rev
Log:
[asan] Disable wait4 test on Android.

https://code.google.com/p/memory-sanitizer/issues/detail?id=64

Added:
    compiler-rt/trunk/test/asan/TestCases/Posix/wait4.cc
      - copied, changed from r217664, compiler-rt/trunk/test/asan/TestCases/Posix/wait.cc
Modified:
    compiler-rt/trunk/test/asan/TestCases/Posix/wait.cc

Modified: compiler-rt/trunk/test/asan/TestCases/Posix/wait.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Posix/wait.cc?rev=217753&r1=217752&r2=217753&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/Posix/wait.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/Posix/wait.cc Mon Sep 15 04:20:15 2014
@@ -7,14 +7,9 @@
 // RUN: %clangxx_asan -DWAIT3 -O0 %s -o %t && not %run %t 2>&1 | FileCheck %s
 // RUN: %clangxx_asan -DWAIT3 -O3 %s -o %t && not %run %t 2>&1 | FileCheck %s
 
-// RUN: %clangxx_asan -DWAIT4 -O0 %s -o %t && not %run %t 2>&1 | FileCheck %s
-// RUN: %clangxx_asan -DWAIT4 -O3 %s -o %t && not %run %t 2>&1 | FileCheck %s
-
 // RUN: %clangxx_asan -DWAIT3_RUSAGE -O0 %s -o %t && not %run %t 2>&1 | FileCheck %s
 // RUN: %clangxx_asan -DWAIT3_RUSAGE -O3 %s -o %t && not %run %t 2>&1 | FileCheck %s
 
-// RUN: %clangxx_asan -DWAIT4_RUSAGE -O0 %s -o %t && not %run %t 2>&1 | FileCheck %s
-// RUN: %clangxx_asan -DWAIT4_RUSAGE -O3 %s -o %t && not %run %t 2>&1 | FileCheck %s
 
 #include <assert.h>
 #include <sys/wait.h>
@@ -32,16 +27,10 @@ int main(int argc, char **argv) {
     res = waitpid(pid, status, WNOHANG);
 #elif defined(WAIT3)
     res = wait3(status, WNOHANG, NULL);
-#elif defined(WAIT4)
-    res = wait4(pid, status, WNOHANG, NULL);
-#elif defined(WAIT3_RUSAGE) || defined(WAIT4_RUSAGE)
+#elif defined(WAIT3_RUSAGE)
     struct rusage *ru = (struct rusage*)(x + argc * 3);
     int good_status;
-# if defined(WAIT3_RUSAGE)
     res = wait3(&good_status, WNOHANG, ru);
-# elif defined(WAIT4_RUSAGE)
-    res = wait4(pid, &good_status, WNOHANG, ru);
-# endif
 #endif
     // CHECK: stack-buffer-overflow
     // CHECK: {{WRITE of size .* at 0x.* thread T0}}

Copied: compiler-rt/trunk/test/asan/TestCases/Posix/wait4.cc (from r217664, compiler-rt/trunk/test/asan/TestCases/Posix/wait.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Posix/wait4.cc?p2=compiler-rt/trunk/test/asan/TestCases/Posix/wait4.cc&p1=compiler-rt/trunk/test/asan/TestCases/Posix/wait.cc&r1=217664&r2=217753&rev=217753&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/Posix/wait.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/Posix/wait4.cc Mon Sep 15 04:20:15 2014
@@ -1,47 +1,34 @@
-// RUN: %clangxx_asan -DWAIT -O0 %s -o %t && not %run %t 2>&1 | FileCheck %s
-// RUN: %clangxx_asan -DWAIT -O3 %s -o %t && not %run %t 2>&1 | FileCheck %s
-
-// RUN: %clangxx_asan -DWAITPID -O0 %s -o %t && not %run %t 2>&1 | FileCheck %s
-// RUN: %clangxx_asan -DWAITPID -O3 %s -o %t && not %run %t 2>&1 | FileCheck %s
-
-// RUN: %clangxx_asan -DWAIT3 -O0 %s -o %t && not %run %t 2>&1 | FileCheck %s
-// RUN: %clangxx_asan -DWAIT3 -O3 %s -o %t && not %run %t 2>&1 | FileCheck %s
-
 // RUN: %clangxx_asan -DWAIT4 -O0 %s -o %t && not %run %t 2>&1 | FileCheck %s
 // RUN: %clangxx_asan -DWAIT4 -O3 %s -o %t && not %run %t 2>&1 | FileCheck %s
 
-// RUN: %clangxx_asan -DWAIT3_RUSAGE -O0 %s -o %t && not %run %t 2>&1 | FileCheck %s
-// RUN: %clangxx_asan -DWAIT3_RUSAGE -O3 %s -o %t && not %run %t 2>&1 | FileCheck %s
-
 // RUN: %clangxx_asan -DWAIT4_RUSAGE -O0 %s -o %t && not %run %t 2>&1 | FileCheck %s
 // RUN: %clangxx_asan -DWAIT4_RUSAGE -O3 %s -o %t && not %run %t 2>&1 | FileCheck %s
 
+// XFAIL: android
+
 #include <assert.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
 int main(int argc, char **argv) {
+  // This test passes on some versions of Android NDK and fails on other.
+  // https://code.google.com/p/memory-sanitizer/issues/detail?id=64
+  // Make it fail unconditionally on Android.
+#ifdef __ANDROID__
+  return 0;
+#endif
+
   pid_t pid = fork();
   if (pid) { // parent
     int x[3];
     int *status = x + argc * 3;
     int res;
-#if defined(WAIT)
-    res = wait(status);
-#elif defined(WAITPID)
-    res = waitpid(pid, status, WNOHANG);
-#elif defined(WAIT3)
-    res = wait3(status, WNOHANG, NULL);
-#elif defined(WAIT4)
+#if defined(WAIT4)
     res = wait4(pid, status, WNOHANG, NULL);
-#elif defined(WAIT3_RUSAGE) || defined(WAIT4_RUSAGE)
+#elif defined(WAIT4_RUSAGE)
     struct rusage *ru = (struct rusage*)(x + argc * 3);
     int good_status;
-# if defined(WAIT3_RUSAGE)
-    res = wait3(&good_status, WNOHANG, ru);
-# elif defined(WAIT4_RUSAGE)
     res = wait4(pid, &good_status, WNOHANG, ru);
-# endif
 #endif
     // CHECK: stack-buffer-overflow
     // CHECK: {{WRITE of size .* at 0x.* thread T0}}