[compiler-rt] r315389 - Factor out "stable-runtime" feature and enable it on all android.

Evgeniy Stepanov via llvm-commits llvm-commits at lists.llvm.org
Tue Oct 10 16:37:26 PDT 2017


Author: eugenis
Date: Tue Oct 10 16:37:26 2017
New Revision: 315389

URL: http://llvm.org/viewvc/llvm-project?rev=315389&view=rev
Log:
Factor out "stable-runtime" feature and enable it on all android.

This is a very poorly named feature. I think originally it meant to cover linux only, but the use of it in msan
seems to be about any aarch64 platform. Anyway, this change should be NFC on everything except Android.

Modified:
    compiler-rt/trunk/test/asan/lit.cfg
    compiler-rt/trunk/test/lit.common.cfg
    compiler-rt/trunk/test/msan/Linux/mallinfo.cc
    compiler-rt/trunk/test/msan/lit.cfg
    compiler-rt/trunk/test/safestack/lit.cfg
    compiler-rt/trunk/test/sanitizer_common/lit.common.cfg
    compiler-rt/trunk/test/tsan/lit.cfg
    compiler-rt/trunk/test/ubsan/lit.common.cfg
    compiler-rt/trunk/test/xray/lit.cfg

Modified: compiler-rt/trunk/test/asan/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/lit.cfg?rev=315389&r1=315388&r2=315389&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/lit.cfg (original)
+++ compiler-rt/trunk/test/asan/lit.cfg Tue Oct 10 16:37:26 2017
@@ -168,11 +168,6 @@ config.substitutions.append( ("%libdl",
 
 config.available_features.add("asan-" + config.bits + "-bits")
 
-# Allow tests to use REQUIRES=stable-runtime.  For use when you cannot use XFAIL
-# because the test hangs. Adding armhf as we now have two modes.
-if config.target_arch != 'arm' and config.target_arch != 'armhf' and config.target_arch != 'aarch64':
-  config.available_features.add('stable-runtime')
-
 # Fast unwinder doesn't work with Thumb
 if re.search('mthumb', config.target_cflags) is not None:
   config.available_features.add('fast-unwinder-works')

Modified: compiler-rt/trunk/test/lit.common.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/lit.common.cfg?rev=315389&r1=315388&r2=315389&view=diff
==============================================================================
--- compiler-rt/trunk/test/lit.common.cfg (original)
+++ compiler-rt/trunk/test/lit.common.cfg Tue Oct 10 16:37:26 2017
@@ -303,3 +303,8 @@ if config.host_os == 'Darwin':
   config.default_sanitizer_opts += ['log_to_syslog=0']
 elif config.android:
   config.default_sanitizer_opts += ['abort_on_error=0']
+
+# 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.android or (config.target_arch not in ['arm', 'armhf', 'aarch64']):
+  config.available_features.add('stable-runtime')

Modified: compiler-rt/trunk/test/msan/Linux/mallinfo.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/Linux/mallinfo.cc?rev=315389&r1=315388&r2=315389&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/Linux/mallinfo.cc (original)
+++ compiler-rt/trunk/test/msan/Linux/mallinfo.cc Tue Oct 10 16:37:26 2017
@@ -1,5 +1,5 @@
 // RUN: %clangxx_msan -O0 -g %s -o %t && %run %t
-// REQUIRES: stable-runtime
+// UNSUPPORTED: aarch64-target-arch
 
 #include <assert.h>
 #include <malloc.h>

Modified: compiler-rt/trunk/test/msan/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/msan/lit.cfg?rev=315389&r1=315388&r2=315389&view=diff
==============================================================================
--- compiler-rt/trunk/test/msan/lit.cfg (original)
+++ compiler-rt/trunk/test/msan/lit.cfg Tue Oct 10 16:37:26 2017
@@ -33,9 +33,6 @@ config.suffixes = ['.c', '.cc', '.cpp']
 if config.host_os not in ['Linux']:
   config.unsupported = True
 
-if config.target_arch != 'aarch64':
-  config.available_features.add('stable-runtime')
-
 # For mips64, mips64el we have forced store_context_size to 1 because these
 # archs use slow unwinder which is not async signal safe. Therefore we only
 # check the first frame since store_context size is 1.

Modified: compiler-rt/trunk/test/safestack/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/safestack/lit.cfg?rev=315389&r1=315388&r2=315389&view=diff
==============================================================================
--- compiler-rt/trunk/test/safestack/lit.cfg (original)
+++ compiler-rt/trunk/test/safestack/lit.cfg Tue Oct 10 16:37:26 2017
@@ -20,8 +20,3 @@ if config.lto_supported:
 
 if config.host_os not in ['Linux', 'FreeBSD', 'Darwin', 'NetBSD']:
    config.unsupported = True
-
-# Allow tests to use REQUIRES=stable-runtime.  For use when you cannot use XFAIL
-# because the test fail due some runtime issue.
-if config.target_arch != 'aarch64':
-  config.available_features.add('stable-runtime')

Modified: compiler-rt/trunk/test/sanitizer_common/lit.common.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/sanitizer_common/lit.common.cfg?rev=315389&r1=315388&r2=315389&view=diff
==============================================================================
--- compiler-rt/trunk/test/sanitizer_common/lit.common.cfg (original)
+++ compiler-rt/trunk/test/sanitizer_common/lit.common.cfg Tue Oct 10 16:37:26 2017
@@ -26,9 +26,6 @@ else:
 
 config.available_features.add(config.tool_name)
 
-if config.target_arch not in ['arm', 'armhf', 'aarch64']:
-  config.available_features.add('stable-runtime')
-
 if config.host_os == 'Linux' and config.tool_name == "lsan" and config.target_arch == 'i386':
   config.available_features.add("lsan-x86")
 

Modified: compiler-rt/trunk/test/tsan/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/lit.cfg?rev=315389&r1=315388&r2=315389&view=diff
==============================================================================
--- compiler-rt/trunk/test/tsan/lit.cfg (original)
+++ compiler-rt/trunk/test/tsan/lit.cfg Tue Oct 10 16:37:26 2017
@@ -83,10 +83,5 @@ config.suffixes = ['.c', '.cc', '.cpp',
 if config.host_os not in ['FreeBSD', 'Linux', 'Darwin']:
   config.unsupported = True
 
-# Allow tests to use REQUIRES=stable-runtime.  For use when you cannot use XFAIL
-# because the test hangs.
-if config.target_arch != 'aarch64':
-  config.available_features.add('stable-runtime')
-
 if config.host_os == 'Darwin' and config.target_arch in ["x86_64", "x86_64h"]:
   config.parallelism_group = "darwin-64bit-sanitizer"

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=315389&r1=315388&r2=315389&view=diff
==============================================================================
--- compiler-rt/trunk/test/ubsan/lit.common.cfg (original)
+++ compiler-rt/trunk/test/ubsan/lit.common.cfg Tue Oct 10 16:37:26 2017
@@ -73,9 +73,4 @@ config.suffixes = ['.c', '.cc', '.cpp']
 if config.host_os not in ['Linux', 'Darwin', 'FreeBSD', 'Windows', 'NetBSD']:
   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.startswith('arm') == False and config.target_arch != 'aarch64':
-  config.available_features.add('stable-runtime')
-
 config.available_features.add('arch=' + config.target_arch)

Modified: compiler-rt/trunk/test/xray/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/lit.cfg?rev=315389&r1=315388&r2=315389&view=diff
==============================================================================
--- compiler-rt/trunk/test/xray/lit.cfg (original)
+++ compiler-rt/trunk/test/xray/lit.cfg Tue Oct 10 16:37:26 2017
@@ -48,8 +48,3 @@ elif '64' not in config.host_arch:
       config.unsupported = True
   else:
     config.unsupported = True
-
-# Allow tests to use REQUIRES=stable-runtime.  For use when you cannot use XFAIL
-# e.g. because the test sometimes passes, sometimes fails.
-if config.target_arch != 'aarch64':
-  config.available_features.add('stable-runtime')




More information about the llvm-commits mailing list