summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--compiler-rt/test/asan/TestCases/Linux/asan_preload_test-1.cc4
-rw-r--r--compiler-rt/test/asan/TestCases/Linux/asan_preload_test-2.cc4
-rw-r--r--compiler-rt/test/asan/lit.cfg1
3 files changed, 7 insertions, 2 deletions
diff --git a/compiler-rt/test/asan/TestCases/Linux/asan_preload_test-1.cc b/compiler-rt/test/asan/TestCases/Linux/asan_preload_test-1.cc
index ba96872d5e9..e5eab5545b8 100644
--- a/compiler-rt/test/asan/TestCases/Linux/asan_preload_test-1.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/asan_preload_test-1.cc
@@ -8,7 +8,9 @@
// RUN: LD_PRELOAD=%shared_libasan not %run %t 2>&1 | FileCheck %s
// REQUIRES: asan-dynamic-runtime
-// XFAIL: android
+
+// This way of setting LD_PRELOAD does not work with Android test runner.
+// REQUIRES: not-android
#if BUILD_SO
char dummy;
diff --git a/compiler-rt/test/asan/TestCases/Linux/asan_preload_test-2.cc b/compiler-rt/test/asan/TestCases/Linux/asan_preload_test-2.cc
index 0741958a5ed..00b32e15d17 100644
--- a/compiler-rt/test/asan/TestCases/Linux/asan_preload_test-2.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/asan_preload_test-2.cc
@@ -4,7 +4,9 @@
// RUN: LD_PRELOAD=%shared_libasan not %run %t 2>&1 | FileCheck %s
// REQUIRES: asan-dynamic-runtime
-// XFAIL: android
+
+// This way of setting LD_PRELOAD does not work with Android test runner.
+// REQUIRES: not-android
#include <stdlib.h>
diff --git a/compiler-rt/test/asan/lit.cfg b/compiler-rt/test/asan/lit.cfg
index ffe353de734..3ec93910088 100644
--- a/compiler-rt/test/asan/lit.cfg
+++ b/compiler-rt/test/asan/lit.cfg
@@ -60,6 +60,7 @@ if config.android == "1":
clang_wrapper = os.path.join(asan_lit_source_dir,
"android_commands", "android_compile.py") + " "
else:
+ config.available_features.add('not-android')
clang_wrapper = ""
def build_invocation(compile_flags):
OpenPOWER on IntegriCloud