[compiler-rt] e68efed - Fix more compiler-rt tests after #149015.
Peter Collingbourne via llvm-commits
llvm-commits at lists.llvm.org
Thu Jul 17 12:38:42 PDT 2025
Author: Peter Collingbourne
Date: 2025-07-17T12:35:18-07:00
New Revision: e68efed71ba818a9eb18a2baede922e1e2ff9a46
URL: https://github.com/llvm/llvm-project/commit/e68efed71ba818a9eb18a2baede922e1e2ff9a46
DIFF: https://github.com/llvm/llvm-project/commit/e68efed71ba818a9eb18a2baede922e1e2ff9a46.diff
LOG: Fix more compiler-rt tests after #149015.
Added:
Modified:
compiler-rt/test/asan/TestCases/Darwin/lit.local.cfg.py
compiler-rt/test/asan/TestCases/Linux/lit.local.cfg.py
compiler-rt/test/asan/TestCases/Posix/lit.local.cfg.py
compiler-rt/test/asan/TestCases/Windows/lit.local.cfg.py
compiler-rt/test/builtins/TestCases/Darwin/lit.local.cfg.py
compiler-rt/test/cfi/cross-dso/lit.local.cfg.py
compiler-rt/test/hwasan/TestCases/Linux/lit.local.cfg.py
compiler-rt/test/hwasan/TestCases/Posix/lit.local.cfg.py
compiler-rt/test/lsan/TestCases/Darwin/lit.local.cfg.py
compiler-rt/test/lsan/TestCases/Linux/lit.local.cfg.py
compiler-rt/test/lsan/TestCases/Posix/lit.local.cfg.py
compiler-rt/test/msan/Linux/lit.local.cfg.py
compiler-rt/test/orc/TestCases/Darwin/lit.local.cfg.py
compiler-rt/test/orc/TestCases/FreeBSD/lit.local.cfg.py
compiler-rt/test/orc/TestCases/Linux/lit.local.cfg.py
compiler-rt/test/orc/TestCases/Windows/lit.local.cfg.py
compiler-rt/test/profile/AIX/lit.local.cfg.py
compiler-rt/test/profile/Darwin/lit.local.cfg.py
compiler-rt/test/profile/Linux/lit.local.cfg.py
compiler-rt/test/profile/Posix/lit.local.cfg.py
compiler-rt/test/profile/Windows/lit.local.cfg.py
compiler-rt/test/sanitizer_common/TestCases/Darwin/lit.local.cfg.py
compiler-rt/test/sanitizer_common/TestCases/FreeBSD/lit.local.cfg.py
compiler-rt/test/sanitizer_common/TestCases/Linux/lit.local.cfg.py
compiler-rt/test/sanitizer_common/TestCases/NetBSD/lit.local.cfg.py
compiler-rt/test/sanitizer_common/TestCases/Posix/lit.local.cfg.py
compiler-rt/test/tsan/Darwin/lit.local.cfg.py
compiler-rt/test/tsan/Linux/lit.local.cfg.py
compiler-rt/test/tsan/libcxx/lit.local.cfg.py
compiler-rt/test/ubsan/TestCases/Misc/Posix/lit.local.cfg.py
compiler-rt/test/ubsan/TestCases/TypeCheck/Linux/lit.local.cfg.py
Removed:
################################################################################
diff --git a/compiler-rt/test/asan/TestCases/Darwin/lit.local.cfg.py b/compiler-rt/test/asan/TestCases/Darwin/lit.local.cfg.py
index 520a963d01198..af82d30cf4de9 100644
--- a/compiler-rt/test/asan/TestCases/Darwin/lit.local.cfg.py
+++ b/compiler-rt/test/asan/TestCases/Darwin/lit.local.cfg.py
@@ -6,5 +6,5 @@ def getRoot(config):
root = getRoot(config)
-if root.host_os not in ["Darwin"]:
+if root.target_os not in ["Darwin"]:
config.unsupported = True
diff --git a/compiler-rt/test/asan/TestCases/Linux/lit.local.cfg.py b/compiler-rt/test/asan/TestCases/Linux/lit.local.cfg.py
index 603ca0365068f..3ea05fa044356 100644
--- a/compiler-rt/test/asan/TestCases/Linux/lit.local.cfg.py
+++ b/compiler-rt/test/asan/TestCases/Linux/lit.local.cfg.py
@@ -6,5 +6,5 @@ def getRoot(config):
root = getRoot(config)
-if root.host_os not in ["Linux"]:
+if root.target_os not in ["Linux"]:
config.unsupported = True
diff --git a/compiler-rt/test/asan/TestCases/Posix/lit.local.cfg.py b/compiler-rt/test/asan/TestCases/Posix/lit.local.cfg.py
index 63240c3962565..c43790b98f38a 100644
--- a/compiler-rt/test/asan/TestCases/Posix/lit.local.cfg.py
+++ b/compiler-rt/test/asan/TestCases/Posix/lit.local.cfg.py
@@ -6,5 +6,5 @@ def getRoot(config):
root = getRoot(config)
-if root.host_os in ["Windows"]:
+if root.target_os in ["Windows"]:
config.unsupported = True
diff --git a/compiler-rt/test/asan/TestCases/Windows/lit.local.cfg.py b/compiler-rt/test/asan/TestCases/Windows/lit.local.cfg.py
index 57c0979e60962..b622e072bcbfb 100644
--- a/compiler-rt/test/asan/TestCases/Windows/lit.local.cfg.py
+++ b/compiler-rt/test/asan/TestCases/Windows/lit.local.cfg.py
@@ -6,5 +6,5 @@ def getRoot(config):
root = getRoot(config)
-if root.host_os not in ["Windows"]:
+if root.target_os not in ["Windows"]:
config.unsupported = True
diff --git a/compiler-rt/test/builtins/TestCases/Darwin/lit.local.cfg.py b/compiler-rt/test/builtins/TestCases/Darwin/lit.local.cfg.py
index 520a963d01198..af82d30cf4de9 100644
--- a/compiler-rt/test/builtins/TestCases/Darwin/lit.local.cfg.py
+++ b/compiler-rt/test/builtins/TestCases/Darwin/lit.local.cfg.py
@@ -6,5 +6,5 @@ def getRoot(config):
root = getRoot(config)
-if root.host_os not in ["Darwin"]:
+if root.target_os not in ["Darwin"]:
config.unsupported = True
diff --git a/compiler-rt/test/cfi/cross-dso/lit.local.cfg.py b/compiler-rt/test/cfi/cross-dso/lit.local.cfg.py
index dceb7cde7218b..2778d8c995fd1 100644
--- a/compiler-rt/test/cfi/cross-dso/lit.local.cfg.py
+++ b/compiler-rt/test/cfi/cross-dso/lit.local.cfg.py
@@ -6,7 +6,7 @@ def getRoot(config):
root = getRoot(config)
-if root.host_os not in ["Linux", "FreeBSD", "NetBSD"]:
+if root.target_os not in ["Linux", "FreeBSD", "NetBSD"]:
config.unsupported = True
# Android O (API level 26) has support for cross-dso cfi in libdl.so.
diff --git a/compiler-rt/test/hwasan/TestCases/Linux/lit.local.cfg.py b/compiler-rt/test/hwasan/TestCases/Linux/lit.local.cfg.py
index 603ca0365068f..3ea05fa044356 100644
--- a/compiler-rt/test/hwasan/TestCases/Linux/lit.local.cfg.py
+++ b/compiler-rt/test/hwasan/TestCases/Linux/lit.local.cfg.py
@@ -6,5 +6,5 @@ def getRoot(config):
root = getRoot(config)
-if root.host_os not in ["Linux"]:
+if root.target_os not in ["Linux"]:
config.unsupported = True
diff --git a/compiler-rt/test/hwasan/TestCases/Posix/lit.local.cfg.py b/compiler-rt/test/hwasan/TestCases/Posix/lit.local.cfg.py
index 63240c3962565..c43790b98f38a 100644
--- a/compiler-rt/test/hwasan/TestCases/Posix/lit.local.cfg.py
+++ b/compiler-rt/test/hwasan/TestCases/Posix/lit.local.cfg.py
@@ -6,5 +6,5 @@ def getRoot(config):
root = getRoot(config)
-if root.host_os in ["Windows"]:
+if root.target_os in ["Windows"]:
config.unsupported = True
diff --git a/compiler-rt/test/lsan/TestCases/Darwin/lit.local.cfg.py b/compiler-rt/test/lsan/TestCases/Darwin/lit.local.cfg.py
index 520a963d01198..af82d30cf4de9 100644
--- a/compiler-rt/test/lsan/TestCases/Darwin/lit.local.cfg.py
+++ b/compiler-rt/test/lsan/TestCases/Darwin/lit.local.cfg.py
@@ -6,5 +6,5 @@ def getRoot(config):
root = getRoot(config)
-if root.host_os not in ["Darwin"]:
+if root.target_os not in ["Darwin"]:
config.unsupported = True
diff --git a/compiler-rt/test/lsan/TestCases/Linux/lit.local.cfg.py b/compiler-rt/test/lsan/TestCases/Linux/lit.local.cfg.py
index 603ca0365068f..3ea05fa044356 100644
--- a/compiler-rt/test/lsan/TestCases/Linux/lit.local.cfg.py
+++ b/compiler-rt/test/lsan/TestCases/Linux/lit.local.cfg.py
@@ -6,5 +6,5 @@ def getRoot(config):
root = getRoot(config)
-if root.host_os not in ["Linux"]:
+if root.target_os not in ["Linux"]:
config.unsupported = True
diff --git a/compiler-rt/test/lsan/TestCases/Posix/lit.local.cfg.py b/compiler-rt/test/lsan/TestCases/Posix/lit.local.cfg.py
index 63240c3962565..c43790b98f38a 100644
--- a/compiler-rt/test/lsan/TestCases/Posix/lit.local.cfg.py
+++ b/compiler-rt/test/lsan/TestCases/Posix/lit.local.cfg.py
@@ -6,5 +6,5 @@ def getRoot(config):
root = getRoot(config)
-if root.host_os in ["Windows"]:
+if root.target_os in ["Windows"]:
config.unsupported = True
diff --git a/compiler-rt/test/msan/Linux/lit.local.cfg.py b/compiler-rt/test/msan/Linux/lit.local.cfg.py
index 603ca0365068f..3ea05fa044356 100644
--- a/compiler-rt/test/msan/Linux/lit.local.cfg.py
+++ b/compiler-rt/test/msan/Linux/lit.local.cfg.py
@@ -6,5 +6,5 @@ def getRoot(config):
root = getRoot(config)
-if root.host_os not in ["Linux"]:
+if root.target_os not in ["Linux"]:
config.unsupported = True
diff --git a/compiler-rt/test/orc/TestCases/Darwin/lit.local.cfg.py b/compiler-rt/test/orc/TestCases/Darwin/lit.local.cfg.py
index b455a936e7cc1..2e3d36c446714 100644
--- a/compiler-rt/test/orc/TestCases/Darwin/lit.local.cfg.py
+++ b/compiler-rt/test/orc/TestCases/Darwin/lit.local.cfg.py
@@ -1,2 +1,2 @@
-if config.root.host_os != "Darwin":
+if config.root.target_os != "Darwin":
config.unsupported = True
diff --git a/compiler-rt/test/orc/TestCases/FreeBSD/lit.local.cfg.py b/compiler-rt/test/orc/TestCases/FreeBSD/lit.local.cfg.py
index e9b1b38ccacd1..0efdb55dc77f4 100644
--- a/compiler-rt/test/orc/TestCases/FreeBSD/lit.local.cfg.py
+++ b/compiler-rt/test/orc/TestCases/FreeBSD/lit.local.cfg.py
@@ -1,2 +1,2 @@
-if config.root.host_os != "FreeBSD":
+if config.root.target_os != "FreeBSD":
config.unsupported = True
diff --git a/compiler-rt/test/orc/TestCases/Linux/lit.local.cfg.py b/compiler-rt/test/orc/TestCases/Linux/lit.local.cfg.py
index 7d85fa3fce392..32e5cfdb141ae 100644
--- a/compiler-rt/test/orc/TestCases/Linux/lit.local.cfg.py
+++ b/compiler-rt/test/orc/TestCases/Linux/lit.local.cfg.py
@@ -1,2 +1,2 @@
-if config.root.host_os != "Linux":
+if config.root.target_os != "Linux":
config.unsupported = True
diff --git a/compiler-rt/test/orc/TestCases/Windows/lit.local.cfg.py b/compiler-rt/test/orc/TestCases/Windows/lit.local.cfg.py
index 6d4e7da813641..99d4464cf9e77 100644
--- a/compiler-rt/test/orc/TestCases/Windows/lit.local.cfg.py
+++ b/compiler-rt/test/orc/TestCases/Windows/lit.local.cfg.py
@@ -1,2 +1,2 @@
-if config.root.host_os != "Windows":
+if config.root.target_os != "Windows":
config.unsupported = True
diff --git a/compiler-rt/test/profile/AIX/lit.local.cfg.py b/compiler-rt/test/profile/AIX/lit.local.cfg.py
index 55462708e3b6c..3337c692bd0d7 100644
--- a/compiler-rt/test/profile/AIX/lit.local.cfg.py
+++ b/compiler-rt/test/profile/AIX/lit.local.cfg.py
@@ -6,5 +6,5 @@ def getRoot(config):
root = getRoot(config)
-if root.host_os not in ["AIX"]:
+if root.target_os not in ["AIX"]:
config.unsupported = True
diff --git a/compiler-rt/test/profile/Darwin/lit.local.cfg.py b/compiler-rt/test/profile/Darwin/lit.local.cfg.py
index 520a963d01198..af82d30cf4de9 100644
--- a/compiler-rt/test/profile/Darwin/lit.local.cfg.py
+++ b/compiler-rt/test/profile/Darwin/lit.local.cfg.py
@@ -6,5 +6,5 @@ def getRoot(config):
root = getRoot(config)
-if root.host_os not in ["Darwin"]:
+if root.target_os not in ["Darwin"]:
config.unsupported = True
diff --git a/compiler-rt/test/profile/Linux/lit.local.cfg.py b/compiler-rt/test/profile/Linux/lit.local.cfg.py
index c1e89581a1ab9..4bce33db9bbf7 100644
--- a/compiler-rt/test/profile/Linux/lit.local.cfg.py
+++ b/compiler-rt/test/profile/Linux/lit.local.cfg.py
@@ -42,7 +42,7 @@ def is_gold_linker_available():
root = getRoot(config)
-if root.host_os not in ["Linux"] or not is_gold_linker_available():
+if root.target_os not in ["Linux"] or not is_gold_linker_available():
config.unsupported = True
if config.have_curl:
diff --git a/compiler-rt/test/profile/Posix/lit.local.cfg.py b/compiler-rt/test/profile/Posix/lit.local.cfg.py
index 17a67689192d0..62ee3cbb466c4 100644
--- a/compiler-rt/test/profile/Posix/lit.local.cfg.py
+++ b/compiler-rt/test/profile/Posix/lit.local.cfg.py
@@ -6,12 +6,12 @@ def getRoot(config):
root = getRoot(config)
-if root.host_os in ["Windows"]:
+if root.target_os in ["Windows"]:
config.unsupported = True
# AIX usually usually makes use of an explicit export list when linking a shared
# object, since the linker doesn't export anything by default.
-if root.host_os in ["AIX"]:
+if root.target_os in ["AIX"]:
config.substitutions.append(("%shared_linker_xopts", "-Wl,-bE:shr.exp"))
else:
config.substitutions.append(("%shared_linker_xopts", ""))
diff --git a/compiler-rt/test/profile/Windows/lit.local.cfg.py b/compiler-rt/test/profile/Windows/lit.local.cfg.py
index 57c0979e60962..b622e072bcbfb 100644
--- a/compiler-rt/test/profile/Windows/lit.local.cfg.py
+++ b/compiler-rt/test/profile/Windows/lit.local.cfg.py
@@ -6,5 +6,5 @@ def getRoot(config):
root = getRoot(config)
-if root.host_os not in ["Windows"]:
+if root.target_os not in ["Windows"]:
config.unsupported = True
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Darwin/lit.local.cfg.py b/compiler-rt/test/sanitizer_common/TestCases/Darwin/lit.local.cfg.py
index 520a963d01198..af82d30cf4de9 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Darwin/lit.local.cfg.py
+++ b/compiler-rt/test/sanitizer_common/TestCases/Darwin/lit.local.cfg.py
@@ -6,5 +6,5 @@ def getRoot(config):
root = getRoot(config)
-if root.host_os not in ["Darwin"]:
+if root.target_os not in ["Darwin"]:
config.unsupported = True
diff --git a/compiler-rt/test/sanitizer_common/TestCases/FreeBSD/lit.local.cfg.py b/compiler-rt/test/sanitizer_common/TestCases/FreeBSD/lit.local.cfg.py
index 0102001660cf1..d4948f04ef64e 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/FreeBSD/lit.local.cfg.py
+++ b/compiler-rt/test/sanitizer_common/TestCases/FreeBSD/lit.local.cfg.py
@@ -6,5 +6,5 @@ def getRoot(config):
root = getRoot(config)
-if root.host_os not in ["FreeBSD"]:
+if root.target_os not in ["FreeBSD"]:
config.unsupported = True
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 603ca0365068f..3ea05fa044356 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
@@ -6,5 +6,5 @@ def getRoot(config):
root = getRoot(config)
-if root.host_os not in ["Linux"]:
+if root.target_os not in ["Linux"]:
config.unsupported = True
diff --git a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/lit.local.cfg.py b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/lit.local.cfg.py
index 3cd1aa667343c..aa4438d04380a 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/NetBSD/lit.local.cfg.py
+++ b/compiler-rt/test/sanitizer_common/TestCases/NetBSD/lit.local.cfg.py
@@ -6,5 +6,5 @@ def getRoot(config):
root = getRoot(config)
-if root.host_os not in ["NetBSD"]:
+if root.target_os not in ["NetBSD"]:
config.unsupported = True
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/lit.local.cfg.py b/compiler-rt/test/sanitizer_common/TestCases/Posix/lit.local.cfg.py
index 63240c3962565..c43790b98f38a 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/lit.local.cfg.py
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/lit.local.cfg.py
@@ -6,5 +6,5 @@ def getRoot(config):
root = getRoot(config)
-if root.host_os in ["Windows"]:
+if root.target_os in ["Windows"]:
config.unsupported = True
diff --git a/compiler-rt/test/tsan/Darwin/lit.local.cfg.py b/compiler-rt/test/tsan/Darwin/lit.local.cfg.py
index 7bf80ac5e1375..876f0cd638bd2 100644
--- a/compiler-rt/test/tsan/Darwin/lit.local.cfg.py
+++ b/compiler-rt/test/tsan/Darwin/lit.local.cfg.py
@@ -6,7 +6,7 @@ def getRoot(config):
root = getRoot(config)
-if root.host_os not in ["Darwin"]:
+if root.target_os not in ["Darwin"]:
config.unsupported = True
config.environment["TSAN_OPTIONS"] += ":ignore_noninstrumented_modules=1"
diff --git a/compiler-rt/test/tsan/Linux/lit.local.cfg.py b/compiler-rt/test/tsan/Linux/lit.local.cfg.py
index 603ca0365068f..3ea05fa044356 100644
--- a/compiler-rt/test/tsan/Linux/lit.local.cfg.py
+++ b/compiler-rt/test/tsan/Linux/lit.local.cfg.py
@@ -6,5 +6,5 @@ def getRoot(config):
root = getRoot(config)
-if root.host_os not in ["Linux"]:
+if root.target_os not in ["Linux"]:
config.unsupported = True
diff --git a/compiler-rt/test/tsan/libcxx/lit.local.cfg.py b/compiler-rt/test/tsan/libcxx/lit.local.cfg.py
index f4820dccb0109..b8d054e2de976 100644
--- a/compiler-rt/test/tsan/libcxx/lit.local.cfg.py
+++ b/compiler-rt/test/tsan/libcxx/lit.local.cfg.py
@@ -8,5 +8,5 @@ def getRoot(config):
# Only run if we have an instrumented libcxx. On Darwin, run always (we have
# interceptors to support the system-provided libcxx).
-if not root.has_libcxx and root.host_os != "Darwin":
+if not root.has_libcxx and root.target_os != "Darwin":
config.unsupported = True
diff --git a/compiler-rt/test/ubsan/TestCases/Misc/Posix/lit.local.cfg.py b/compiler-rt/test/ubsan/TestCases/Misc/Posix/lit.local.cfg.py
index 63240c3962565..c43790b98f38a 100644
--- a/compiler-rt/test/ubsan/TestCases/Misc/Posix/lit.local.cfg.py
+++ b/compiler-rt/test/ubsan/TestCases/Misc/Posix/lit.local.cfg.py
@@ -6,5 +6,5 @@ def getRoot(config):
root = getRoot(config)
-if root.host_os in ["Windows"]:
+if root.target_os in ["Windows"]:
config.unsupported = True
diff --git a/compiler-rt/test/ubsan/TestCases/TypeCheck/Linux/lit.local.cfg.py b/compiler-rt/test/ubsan/TestCases/TypeCheck/Linux/lit.local.cfg.py
index 603ca0365068f..3ea05fa044356 100644
--- a/compiler-rt/test/ubsan/TestCases/TypeCheck/Linux/lit.local.cfg.py
+++ b/compiler-rt/test/ubsan/TestCases/TypeCheck/Linux/lit.local.cfg.py
@@ -6,5 +6,5 @@ def getRoot(config):
root = getRoot(config)
-if root.host_os not in ["Linux"]:
+if root.target_os not in ["Linux"]:
config.unsupported = True
More information about the llvm-commits
mailing list