[compiler-rt] r279918 - [asan] Disable tests more selectively.

[Akira Hatanaka via llvm-commits]

Author: ahatanak
Date: Sat Aug 27 11:06:36 2016
New Revision: 279918

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

Modified:
    compiler-rt/trunk/test/asan/TestCases/Posix/asan-symbolize-sanity-test.cc
    compiler-rt/trunk/test/lit.common.cfg
    compiler-rt/trunk/test/sanitizer_common/TestCases/symbolize_pc.cc

Modified: compiler-rt/trunk/test/asan/TestCases/Posix/asan-symbolize-sanity-test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Posix/asan-symbolize-sanity-test.cc?rev=279918&r1=279917&r2=279918&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/Posix/asan-symbolize-sanity-test.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/Posix/asan-symbolize-sanity-test.cc Sat Aug 27 11:06:36 2016
@@ -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>

Modified: compiler-rt/trunk/test/lit.common.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/lit.common.cfg?rev=279918&r1=279917&r2=279918&view=diff
==============================================================================
--- compiler-rt/trunk/test/lit.common.cfg (original)
+++ compiler-rt/trunk/test/lit.common.cfg Sat Aug 27 11:06:36 2016
@@ -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:

Modified: compiler-rt/trunk/test/sanitizer_common/TestCases/symbolize_pc.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/sanitizer_common/TestCases/symbolize_pc.cc?rev=279918&r1=279917&r2=279918&view=diff
==============================================================================
--- compiler-rt/trunk/test/sanitizer_common/TestCases/symbolize_pc.cc (original)
+++ compiler-rt/trunk/test/sanitizer_common/TestCases/symbolize_pc.cc Sat Aug 27 11:06:36 2016
@@ -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>