[compiler-rt] 274ec42 - [test] Precisely disable flaky sanitizer tests on clang-ppc64le-redhat

[Fangrui Song via llvm-commits]

Author: Fangrui Song
Date: 2022-02-26T07:25:44Z
New Revision: 274ec425dcc3e3f637dd006c5e9ae33bd0e2e917

URL: https://github.com/llvm/llvm-project/commit/274ec425dcc3e3f637dd006c5e9ae33bd0e2e917
DIFF: https://github.com/llvm/llvm-project/commit/274ec425dcc3e3f637dd006c5e9ae33bd0e2e917.diff

LOG: [test] Precisely disable flaky sanitizer tests on clang-ppc64le-redhat

See https://reviews.llvm.org/D120305#3347094

Added: 
    

Modified: 
    compiler-rt/test/lsan/lit.common.cfg.py
    compiler-rt/test/sanitizer_common/TestCases/Linux/lit.local.cfg.py
    compiler-rt/test/sanitizer_common/lit.common.cfg.py

Removed: 
    


################################################################################
diff  --git a/compiler-rt/test/lsan/lit.common.cfg.py b/compiler-rt/test/lsan/lit.common.cfg.py
index 88c557549b38b..626a122eb1615 100644
--- a/compiler-rt/test/lsan/lit.common.cfg.py
+++ b/compiler-rt/test/lsan/lit.common.cfg.py
@@ -74,9 +74,9 @@ def build_invocation(compile_flags):
 config.substitutions.append( ("%clangxx_lsan ", build_invocation(clang_lsan_cxxflags)) )
 
 # LeakSanitizer tests are currently supported on
-# Android{aarch64, x86, x86_64}, x86-64 Linux, PowerPC64 Linux, arm Linux, mips64 Linux, s390x Linux and x86_64 Darwin.
+# Android{aarch64, x86, x86_64}, x86-64 Linux, arm Linux, mips64 Linux, s390x Linux and x86_64 Darwin.
 supported_android = config.android and config.target_arch in ['x86_64', 'i386', 'aarch64'] and 'android-thread-properties-api' in config.available_features
-supported_linux = (not config.android) and config.host_os == 'Linux' and config.host_arch in ['aarch64', 'x86_64', 'ppc64', 'ppc64le', 'mips64', 'riscv64', 'arm', 'armhf', 'armv7l', 's390x']
+supported_linux = (not config.android) and config.host_os == 'Linux' and config.host_arch in ['aarch64', 'x86_64', 'mips64', 'riscv64', 'arm', 'armhf', 'armv7l', 's390x']
 supported_darwin = config.host_os == 'Darwin' and config.target_arch in ['x86_64']
 supported_netbsd = config.host_os == 'NetBSD' and config.target_arch in ['x86_64', 'i386']
 if not (supported_android or supported_linux or supported_darwin or supported_netbsd):

diff  --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/lit.local.cfg.py b/compiler-rt/test/sanitizer_common/TestCases/Linux/lit.local.cfg.py
index 9313e083d6a15..57271b8078a49 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Linux/lit.local.cfg.py
+++ b/compiler-rt/test/sanitizer_common/TestCases/Linux/lit.local.cfg.py
@@ -7,6 +7,3 @@ def getRoot(config):
 
 if root.host_os not in ['Linux']:
   config.unsupported = True
-# FIXME https://github.com/llvm/llvm-project/issues/54084
-if root.host_arch in ['ppc64', 'ppc64le']:
-  config.unsupported = True

diff  --git a/compiler-rt/test/sanitizer_common/lit.common.cfg.py b/compiler-rt/test/sanitizer_common/lit.common.cfg.py
index 110314bbb4bdf..aa735cbaa8f15 100644
--- a/compiler-rt/test/sanitizer_common/lit.common.cfg.py
+++ b/compiler-rt/test/sanitizer_common/lit.common.cfg.py
@@ -81,3 +81,7 @@ def build_invocation(compile_flags):
 
 if config.host_os == 'NetBSD':
   config.substitutions.insert(0, ('%run', config.netbsd_noaslr_prefix))
+
+# FIXME https://github.com/llvm/llvm-project/issues/54084
+if config.host_arch in ['ppc64', 'ppc64le']:
+  config.unsupported = True