[compiler-rt] r222835 - [asan] Disable preload tests on Android.

[Evgeniy Stepanov]

Author: eugenis
Date: Wed Nov 26 09:44:15 2014
New Revision: 222835

URL: http://llvm.org/viewvc/llvm-project?rev=222835&view=rev
Log:
[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.

Modified:
    compiler-rt/trunk/test/asan/TestCases/Linux/asan_preload_test-1.cc
    compiler-rt/trunk/test/asan/TestCases/Linux/asan_preload_test-2.cc
    compiler-rt/trunk/test/asan/lit.cfg

Modified: compiler-rt/trunk/test/asan/TestCases/Linux/asan_preload_test-1.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Linux/asan_preload_test-1.cc?rev=222835&r1=222834&r2=222835&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/Linux/asan_preload_test-1.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/Linux/asan_preload_test-1.cc Wed Nov 26 09:44:15 2014
@@ -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;

Modified: compiler-rt/trunk/test/asan/TestCases/Linux/asan_preload_test-2.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Linux/asan_preload_test-2.cc?rev=222835&r1=222834&r2=222835&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/Linux/asan_preload_test-2.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/Linux/asan_preload_test-2.cc Wed Nov 26 09:44:15 2014
@@ -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>
 

Modified: compiler-rt/trunk/test/asan/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/lit.cfg?rev=222835&r1=222834&r2=222835&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/lit.cfg (original)
+++ compiler-rt/trunk/test/asan/lit.cfg Wed Nov 26 09:44:15 2014
@@ -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):