[compiler-rt] r245292 - Revert "[sanitizer] Move definition of stable-runtime to common lit config."

[Renato Golin via llvm-commits]

Author: rengolin
Date: Tue Aug 18 07:44:55 2015
New Revision: 245292

URL: http://llvm.org/viewvc/llvm-project?rev=245292&view=rev
Log:
Revert "[sanitizer] Move definition of stable-runtime to common lit config."

This reverts commit r245263, and the change wasn't catched by UBsan.

It also reverts: "[ARM] Also disable stable-runtime check on UBsan,
to use generic one" (r245287), as it didn't fix the UBsan builds.

We need to investigate what's going on before continuing, since this
is breaking all ARM RT buildbots for a while.

Modified:
    compiler-rt/trunk/test/asan/lit.cfg
    compiler-rt/trunk/test/lit.common.cfg
    compiler-rt/trunk/test/ubsan/lit.common.cfg

Modified: compiler-rt/trunk/test/asan/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/lit.cfg?rev=245292&r1=245291&r2=245292&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/lit.cfg (original)
+++ compiler-rt/trunk/test/asan/lit.cfg Tue Aug 18 07:44:55 2015
@@ -164,6 +164,11 @@ elif config.host_os == 'Linux':
 config.substitutions.append( ("%dynamiclib", '%T/lib%xdynamiclib_namespec.so') )
 config.substitutions.append( ("%xdynamiclib_namespec", '$(basename %t).dynamic') )
 
+# Allow tests to use REQUIRES=stable-runtime.  For use when you cannot use XFAIL
+# because the test hangs.
+if config.target_arch != 'arm' and config.target_arch != 'aarch64':
+  config.available_features.add('stable-runtime')
+
 # Turn on leak detection on 64-bit Linux.
 if config.host_os == 'Linux' and config.target_arch == 'x86_64':
   config.available_features.add('leak-detection')

Modified: compiler-rt/trunk/test/lit.common.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/lit.common.cfg?rev=245292&r1=245291&r2=245292&view=diff
==============================================================================
--- compiler-rt/trunk/test/lit.common.cfg (original)
+++ compiler-rt/trunk/test/lit.common.cfg Tue Aug 18 07:44:55 2015
@@ -111,11 +111,6 @@ if sanitizer_can_use_cxxabi:
 if config.has_lld:
   config.available_features.add('lld')
 
-# Allow tests to use REQUIRES=stable-runtime.  For use when you cannot use XFAIL
-# because the test hangs.
-if config.target_arch != 'arm' and config.target_arch != 'aarch64':
-  config.available_features.add('stable-runtime')
-
 lit.util.usePlatformSdkOnDarwin(config, lit_config)
 
 def is_darwin_lto_supported():

Modified: compiler-rt/trunk/test/ubsan/lit.common.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/ubsan/lit.common.cfg?rev=245292&r1=245291&r2=245292&view=diff
==============================================================================
--- compiler-rt/trunk/test/ubsan/lit.common.cfg (original)
+++ compiler-rt/trunk/test/ubsan/lit.common.cfg Tue Aug 18 07:44:55 2015
@@ -64,3 +64,8 @@ if config.host_os == 'Windows':
   # We do not currently support enough of the Microsoft ABI for UBSan to work on
   # Windows.
   config.available_features.remove('cxxabi')
+
+# Allow tests to use REQUIRES=stable-runtime.  For use when you cannot use XFAIL
+# because the test hangs or fails on one configuration and not the other.
+if config.target_arch.startswith('arm') == False:
+  config.available_features.add('stable-runtime')