[sanitizer] Re-disable a few tests on android.

Tests were accidentally enabled r354829.

llvm-svn: 354834

diff --git a/compiler-rt/test/asan/TestCases/Linux/swapcontext_annotation.cc b/compiler-rt/test/asan/TestCases/Linux/swapcontext_annotation.cc
index 3bfda73..5eae27a 100644 (file)
--- a/compiler-rt/test/asan/TestCases/Linux/swapcontext_annotation.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/swapcontext_annotation.cc
@@ -12,7 +12,8 @@
 
 //
 // This test is too subtle to try on non-x86 arch for now.
-// REQUIRES: x86-target-arch
+// Android does not support swapcontext.
+// REQUIRES: x86-target-arch && !android
 
 #include <pthread.h>
 #include <setjmp.h>

diff --git a/compiler-rt/test/asan/TestCases/Linux/swapcontext_test.cc b/compiler-rt/test/asan/TestCases/Linux/swapcontext_test.cc
index 210a667..2660ffe 100644 (file)
--- a/compiler-rt/test/asan/TestCases/Linux/swapcontext_test.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/swapcontext_test.cc
@@ -6,7 +6,8 @@
 // RUN: %clangxx_asan -O3 %s -o %t && %run %t 2>&1 | FileCheck %s
 //
 // This test is too sublte to try on non-x86 arch for now.
-// REQUIRES: x86-target-arch
+// Android does not support swapcontext.
+// REQUIRES: x86-target-arch && !android
 
 #include <stdio.h>
 #include <ucontext.h>

diff --git a/compiler-rt/test/asan/TestCases/Linux/unpoison_tls.cc b/compiler-rt/test/asan/TestCases/Linux/unpoison_tls.cc
index 19ebec4..e223453 100644 (file)
--- a/compiler-rt/test/asan/TestCases/Linux/unpoison_tls.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/unpoison_tls.cc
@@ -1,5 +1,5 @@
 // Test that TLS is unpoisoned on thread death.
-// REQUIRES: x86-target-arch
+// REQUIRES: x86-target-arch && !android
 
 // RUN: %clangxx_asan -O1 %s -pthread -o %t && %run %t 2>&1
 

diff --git a/compiler-rt/test/asan/lit.cfg b/compiler-rt/test/asan/lit.cfg
index ccdf071..471144e 100644 (file)
--- a/compiler-rt/test/asan/lit.cfg
+++ b/compiler-rt/test/asan/lit.cfg
@@ -181,7 +181,7 @@ if re.search('mthumb', config.target_cflags) is None:
   config.available_features.add('fast-unwinder-works')
 
 # Turn on leak detection on 64-bit Linux.
-leak_detection_linux = (config.host_os == 'Linux') and (config.target_arch == 'x86_64' or config.target_arch == 'i386')
+leak_detection_linux = (config.host_os == 'Linux') and (not config.android) and (config.target_arch == 'x86_64' or config.target_arch == 'i386')
 leak_detection_mac = (config.host_os == 'Darwin') and (config.target_arch == 'x86_64')
 if leak_detection_linux or leak_detection_mac:
   config.available_features.add('leak-detection')