diff options
-rw-r--r-- | compiler-rt/test/msan/lit.cfg | 3 | ||||
-rw-r--r-- | compiler-rt/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cc (renamed from compiler-rt/test/sanitizer_common/TestCases/Posix/decorate_proc_maps.cc) | 0 | ||||
-rw-r--r-- | compiler-rt/test/sanitizer_common/TestCases/Posix/lit.local.cfg | 2 | ||||
-rw-r--r-- | compiler-rt/test/sanitizer_common/lit.common.cfg | 3 |
4 files changed, 7 insertions, 1 deletions
diff --git a/compiler-rt/test/msan/lit.cfg b/compiler-rt/test/msan/lit.cfg index ed797bdf5cc..d23ff31bc74 100644 --- a/compiler-rt/test/msan/lit.cfg +++ b/compiler-rt/test/msan/lit.cfg @@ -32,3 +32,6 @@ config.suffixes = ['.c', '.cc', '.cpp'] # MemorySanitizer tests are currently supported on Linux only. if config.host_os not in ['Linux']: config.unsupported = True + +if config.target_arch != 'aarch64': + config.available_features.add('stable-runtime') diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/decorate_proc_maps.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cc index 36d4df567ee..36d4df567ee 100644 --- a/compiler-rt/test/sanitizer_common/TestCases/Posix/decorate_proc_maps.cc +++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/decorate_proc_maps.cc diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/lit.local.cfg b/compiler-rt/test/sanitizer_common/TestCases/Posix/lit.local.cfg index a6d96d3054c..60a9460820a 100644 --- a/compiler-rt/test/sanitizer_common/TestCases/Posix/lit.local.cfg +++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/lit.local.cfg @@ -5,5 +5,5 @@ def getRoot(config): root = getRoot(config) -if root.host_os in ['Windows', 'Darwin']: +if root.host_os in ['Windows']: config.unsupported = True diff --git a/compiler-rt/test/sanitizer_common/lit.common.cfg b/compiler-rt/test/sanitizer_common/lit.common.cfg index a9309036ed3..b32fb1ba968 100644 --- a/compiler-rt/test/sanitizer_common/lit.common.cfg +++ b/compiler-rt/test/sanitizer_common/lit.common.cfg @@ -23,6 +23,9 @@ 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 == 'Darwin': # On Darwin, we default to `abort_on_error=1`, which would make tests run # much slower. Let's override this and run lit tests with 'abort_on_error=0'. |