summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeniy Stepanov <eugeni.stepanov@gmail.com>2014-11-26 15:44:15 +0000
committerEvgeniy Stepanov <eugeni.stepanov@gmail.com>2014-11-26 15:44:15 +0000
commit899649d85e20fdef39a4e7d0f0a32979b331b276 (patch)
tree71bb9cbcaf1bae4b765420d99fb9373358fa5e18
parent904675cff5bbff5f69be0347866c37db241569a6 (diff)
[asan] Disable preload tests on Android.
They don't test what they claim to because LD_PRELOAD applies to "not" instead of the actual test binary. And all Android tests run with LD_PRELOAD anyway. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@222835 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--test/asan/TestCases/Linux/asan_preload_test-1.cc4
-rw-r--r--test/asan/TestCases/Linux/asan_preload_test-2.cc4
-rw-r--r--test/asan/lit.cfg1
3 files changed, 7 insertions, 2 deletions
diff --git a/test/asan/TestCases/Linux/asan_preload_test-1.cc b/test/asan/TestCases/Linux/asan_preload_test-1.cc
index ba96872d5..e5eab5545 100644
--- a/test/asan/TestCases/Linux/asan_preload_test-1.cc
+++ b/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/test/asan/TestCases/Linux/asan_preload_test-2.cc b/test/asan/TestCases/Linux/asan_preload_test-2.cc
index 0741958a5..00b32e15d 100644
--- a/test/asan/TestCases/Linux/asan_preload_test-2.cc
+++ b/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/test/asan/lit.cfg b/test/asan/lit.cfg
index ffe353de7..3ec939100 100644
--- a/test/asan/lit.cfg
+++ b/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):