From b52e3aba3f30c4a056a4df0c62e8503862fb78ba Mon Sep 17 00:00:00 2001 From: Evgeniy Stepanov Date: Wed, 26 Nov 2014 15:44:15 +0000 Subject: [PATCH] [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. llvm-svn: 222835 --- compiler-rt/test/asan/TestCases/Linux/asan_preload_test-1.cc | 4 +++- compiler-rt/test/asan/TestCases/Linux/asan_preload_test-2.cc | 4 +++- compiler-rt/test/asan/lit.cfg | 1 + 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 ba96872..e5eab55 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 0741958..00b32e1 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 diff --git a/compiler-rt/test/asan/lit.cfg b/compiler-rt/test/asan/lit.cfg index ffe353d..3ec9391 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): -- 2.7.4