Skip to content

Conversation

@brad0
Copy link
Contributor

@brad0 brad0 commented Jan 30, 2025

Reverts #124879

@brad0 brad0 merged commit 59613ac into main Jan 30, 2025
5 of 7 checks passed
@brad0 brad0 deleted the revert-124879-compiler_rt_accept4_android branch January 30, 2025 01:34
@llvmbot
Copy link
Member

llvmbot commented Jan 30, 2025

@llvm/pr-subscribers-compiler-rt-sanitizer

Author: Brad Smith (brad0)

Changes

Reverts llvm/llvm-project#124879


Full diff: https://github.com/llvm/llvm-project/pull/125011.diff

1 Files Affected:

  • (modified) compiler-rt/test/asan/TestCases/Posix/wait4.cpp (+8)
diff --git a/compiler-rt/test/asan/TestCases/Posix/wait4.cpp b/compiler-rt/test/asan/TestCases/Posix/wait4.cpp
index d6c42f9b1a9ce9..1e574d99fe00c6 100644
--- a/compiler-rt/test/asan/TestCases/Posix/wait4.cpp
+++ b/compiler-rt/test/asan/TestCases/Posix/wait4.cpp
@@ -4,6 +4,7 @@
 // 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
 // UNSUPPORTED: darwin
 
 #include <assert.h>
@@ -11,6 +12,13 @@
 #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];

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants