Adds stable-runtime to ubsan to avoid broken ARM tests with asan

llvm-svn: 219906

diff --git a/compiler-rt/test/ubsan/TestCases/TypeCheck/vptr.cpp b/compiler-rt/test/ubsan/TestCases/TypeCheck/vptr.cpp
index 6d68387..1e1d67a 100644 (file)
--- a/compiler-rt/test/ubsan/TestCases/TypeCheck/vptr.cpp
+++ b/compiler-rt/test/ubsan/TestCases/TypeCheck/vptr.cpp
@@ -25,6 +25,7 @@
 
 // FIXME: This test produces linker errors on Darwin.
 // XFAIL: darwin
+// REQUIRES: stable-runtime
 
 extern "C" {
 const char *__ubsan_default_options() {

diff --git a/compiler-rt/test/ubsan/lit.common.cfg b/compiler-rt/test/ubsan/lit.common.cfg
index dc82b6e..50e81de 100644 (file)
--- a/compiler-rt/test/ubsan/lit.common.cfg
+++ b/compiler-rt/test/ubsan/lit.common.cfg
@@ -50,3 +50,8 @@ config.suffixes = ['.c', '.cc', '.cpp']
 # Linux and Darwin only.
 if config.host_os not in ['Linux', 'Darwin']:
   config.unsupported = True
+
+# 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 != 'arm':
+  config.available_features.add('stable-runtime')