[asan] Disable tests more selectively.

Add "target-arch+host-os" to the feature list to enable disabling the
tests I committed in r279614 and r279880 more selectively.

llvm-svn: 279918

diff --git a/compiler-rt/test/asan/TestCases/Posix/asan-symbolize-sanity-test.cc b/compiler-rt/test/asan/TestCases/Posix/asan-symbolize-sanity-test.cc
index 7052139..d738d70 100644 (file)
--- a/compiler-rt/test/asan/TestCases/Posix/asan-symbolize-sanity-test.cc
+++ b/compiler-rt/test/asan/TestCases/Posix/asan-symbolize-sanity-test.cc
@@ -9,7 +9,7 @@
 // RUN: %env_asan_opts=symbolize=0 not %run %t 2>&1 | %asan_symbolize | FileCheck %s
 // XFAIL: arm-linux-gnueabi
 // XFAIL: armv7l-unknown-linux-gnueabihf
-// UNSUPPORTED: x86_64h-apple,x86_64-apple
+// UNSUPPORTED: x86_64h-darwin,x86_64-darwin
 
 #if !defined(SHARED_LIB)
 #include <dlfcn.h>

diff --git a/compiler-rt/test/lit.common.cfg b/compiler-rt/test/lit.common.cfg
index 8d4d0fa..9c5e7d0 100644 (file)
--- a/compiler-rt/test/lit.common.cfg
+++ b/compiler-rt/test/lit.common.cfg
@@ -104,6 +104,7 @@ if target_arch:
   config.available_features.add(target_arch + '-target-arch')
   if target_arch in ['x86_64', 'i386', 'i686']:
     config.available_features.add('x86-target-arch')
+  config.available_features.add(target_arch + '-' + config.host_os.lower())
 
 compiler_rt_debug = getattr(config, 'compiler_rt_debug', False)
 if not compiler_rt_debug:

diff --git a/compiler-rt/test/sanitizer_common/TestCases/symbolize_pc.cc b/compiler-rt/test/sanitizer_common/TestCases/symbolize_pc.cc
index a05bfd7..deb5b0c 100644 (file)
--- a/compiler-rt/test/sanitizer_common/TestCases/symbolize_pc.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/symbolize_pc.cc
@@ -1,6 +1,6 @@
 // RUN: %clangxx -O0 %s -o %t
 // RUN: %env_tool_opts=strip_path_prefix=/TestCases/ %run %t 2>&1 | FileCheck %s
-// REQUIRES: x86_64-target-arch
+// UNSUPPORTED: i386-darwin
 //
 // Tests __sanitizer_symbolize_pc.
 #include <stdio.h>