[asan] Revert still Androind incompatible tests enabled in r349736

llvm-svn: 349740

diff --git a/compiler-rt/test/asan/TestCases/Linux/asan_rt_confict_test-2.cc b/compiler-rt/test/asan/TestCases/Linux/asan_rt_confict_test-2.cc
index 9d59992..6328cbb 100644 (file)
--- a/compiler-rt/test/asan/TestCases/Linux/asan_rt_confict_test-2.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/asan_rt_confict_test-2.cc
@@ -6,6 +6,7 @@
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 // REQUIRES: asan-dynamic-runtime
+// XFAIL: android
 
 #if BUILD_SO
 char dummy;

diff --git a/compiler-rt/test/asan/TestCases/Linux/odr-violation.cc b/compiler-rt/test/asan/TestCases/Linux/odr-violation.cc
index 87e540f..a1941fc 100644 (file)
--- a/compiler-rt/test/asan/TestCases/Linux/odr-violation.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/odr-violation.cc
@@ -1,3 +1,6 @@
+// FIXME: https://code.google.com/p/address-sanitizer/issues/detail?id=316
+// XFAIL: android
+//
 // We use fast_unwind_on_malloc=0 to have full unwinding even w/o frame
 // pointers. This setting is not on by default because it's too expensive.
 //