[llvm] [NFC][sancov] Move tests into target-specific subdirectories (PR #182111)
Honey Goyal via llvm-commits
llvm-commits at lists.llvm.org
Wed Feb 18 13:53:01 PST 2026
https://github.com/honeygoyal updated https://github.com/llvm/llvm-project/pull/182111
>From c0fc804f95a6bd1ff43679df5f35682727bb4537 Mon Sep 17 00:00:00 2001
From: Honey Goyal <honey.goyal3 at ibm.com>
Date: Wed, 18 Feb 2026 20:00:05 +0000
Subject: [PATCH] [NFC][sancov] Move tests into target-specific subdirectories
The AArch64 test was inheriting the X86 requirement from the parent
lit.local.cfg, making it impossible to run without X86 configured.
Reorganize by moving tests into X86/, AArch64/, and XCOFF/ subdirs,
each with their own lit.local.cfg specifying the required target.
---
.../{ => AArch64}/Inputs/test-linux_android_aarch64 | Bin
llvm/test/tools/sancov/AArch64/lit.local.cfg | 1 +
.../tools/sancov/AArch64/print_coverage_pcs.test | 2 +-
.../sancov/{ => X86}/Inputs/dummy-32bits.0.sancov | Bin
llvm/test/tools/sancov/{ => X86}/Inputs/foo.cpp | 0
.../sancov/{ => X86}/Inputs/fun_ignorelist.txt | 0
.../sancov/{ => X86}/Inputs/src_ignorelist.txt | 0
.../sancov/{ => X86}/Inputs/test-darwin_x86_64 | Bin
.../tools/sancov/{ => X86}/Inputs/test-linux_x86_64 | Bin
.../{ => X86}/Inputs/test-linux_x86_64.0.sancov | Bin
.../{ => X86}/Inputs/test-linux_x86_64.0.symcov | 0
.../{ => X86}/Inputs/test-linux_x86_64.1.sancov | Bin
.../{ => X86}/Inputs/test-linux_x86_64.1.symcov | 0
.../sancov/{ => X86}/Inputs/test-windows_x86_64 | Bin
llvm/test/tools/sancov/{ => X86}/Inputs/test.cpp | 0
.../tools/sancov/{ => X86}/covered_functions.test | 0
.../sancov/{ => X86}/diff-different-bitness.test | 0
.../sancov/{ => X86}/diff-different-files.test | 0
.../test/tools/sancov/{ => X86}/diff-same-file.test | 0
llvm/test/tools/sancov/{ => X86}/ignorelist.test | 0
llvm/test/tools/sancov/X86/lit.local.cfg | 1 +
llvm/test/tools/sancov/{ => X86}/merge.test | 0
.../sancov/{ => X86}/not_covered_functions.test | 0
llvm/test/tools/sancov/{ => X86}/print.test | 0
.../tools/sancov/{ => X86}/print_coverage_pcs.test | 0
llvm/test/tools/sancov/{ => X86}/stats.test | 0
llvm/test/tools/sancov/{ => X86}/symbolize.test | 0
.../{ => X86}/symbolize_noskip_dead_files.test | 0
.../sancov/{ => X86}/union-different-bitness.test | 0
.../sancov/{ => X86}/union-different-files.test | 0
.../tools/sancov/{ => X86}/union-same-file.test | 0
llvm/test/tools/sancov/{ => X86}/validation.test | 0
llvm/test/tools/sancov/XCOFF/lit.local.cfg | 1 +
llvm/test/tools/sancov/lit.local.cfg | 4 ----
34 files changed, 4 insertions(+), 5 deletions(-)
rename llvm/test/tools/sancov/{ => AArch64}/Inputs/test-linux_android_aarch64 (100%)
create mode 100644 llvm/test/tools/sancov/AArch64/lit.local.cfg
rename llvm/test/tools/sancov/{ => X86}/Inputs/dummy-32bits.0.sancov (100%)
rename llvm/test/tools/sancov/{ => X86}/Inputs/foo.cpp (100%)
rename llvm/test/tools/sancov/{ => X86}/Inputs/fun_ignorelist.txt (100%)
rename llvm/test/tools/sancov/{ => X86}/Inputs/src_ignorelist.txt (100%)
rename llvm/test/tools/sancov/{ => X86}/Inputs/test-darwin_x86_64 (100%)
rename llvm/test/tools/sancov/{ => X86}/Inputs/test-linux_x86_64 (100%)
rename llvm/test/tools/sancov/{ => X86}/Inputs/test-linux_x86_64.0.sancov (100%)
rename llvm/test/tools/sancov/{ => X86}/Inputs/test-linux_x86_64.0.symcov (100%)
rename llvm/test/tools/sancov/{ => X86}/Inputs/test-linux_x86_64.1.sancov (100%)
rename llvm/test/tools/sancov/{ => X86}/Inputs/test-linux_x86_64.1.symcov (100%)
rename llvm/test/tools/sancov/{ => X86}/Inputs/test-windows_x86_64 (100%)
rename llvm/test/tools/sancov/{ => X86}/Inputs/test.cpp (100%)
rename llvm/test/tools/sancov/{ => X86}/covered_functions.test (100%)
rename llvm/test/tools/sancov/{ => X86}/diff-different-bitness.test (100%)
rename llvm/test/tools/sancov/{ => X86}/diff-different-files.test (100%)
rename llvm/test/tools/sancov/{ => X86}/diff-same-file.test (100%)
rename llvm/test/tools/sancov/{ => X86}/ignorelist.test (100%)
create mode 100644 llvm/test/tools/sancov/X86/lit.local.cfg
rename llvm/test/tools/sancov/{ => X86}/merge.test (100%)
rename llvm/test/tools/sancov/{ => X86}/not_covered_functions.test (100%)
rename llvm/test/tools/sancov/{ => X86}/print.test (100%)
rename llvm/test/tools/sancov/{ => X86}/print_coverage_pcs.test (100%)
rename llvm/test/tools/sancov/{ => X86}/stats.test (100%)
rename llvm/test/tools/sancov/{ => X86}/symbolize.test (100%)
rename llvm/test/tools/sancov/{ => X86}/symbolize_noskip_dead_files.test (100%)
rename llvm/test/tools/sancov/{ => X86}/union-different-bitness.test (100%)
rename llvm/test/tools/sancov/{ => X86}/union-different-files.test (100%)
rename llvm/test/tools/sancov/{ => X86}/union-same-file.test (100%)
rename llvm/test/tools/sancov/{ => X86}/validation.test (100%)
create mode 100644 llvm/test/tools/sancov/XCOFF/lit.local.cfg
delete mode 100644 llvm/test/tools/sancov/lit.local.cfg
diff --git a/llvm/test/tools/sancov/Inputs/test-linux_android_aarch64 b/llvm/test/tools/sancov/AArch64/Inputs/test-linux_android_aarch64
similarity index 100%
rename from llvm/test/tools/sancov/Inputs/test-linux_android_aarch64
rename to llvm/test/tools/sancov/AArch64/Inputs/test-linux_android_aarch64
diff --git a/llvm/test/tools/sancov/AArch64/lit.local.cfg b/llvm/test/tools/sancov/AArch64/lit.local.cfg
new file mode 100644
index 0000000000000..ddec90856178e
--- /dev/null
+++ b/llvm/test/tools/sancov/AArch64/lit.local.cfg
@@ -0,0 +1 @@
+config.requires = ['aarch64-registered-target']
diff --git a/llvm/test/tools/sancov/AArch64/print_coverage_pcs.test b/llvm/test/tools/sancov/AArch64/print_coverage_pcs.test
index d5fff4db1320d..18e8d12e3bc76 100644
--- a/llvm/test/tools/sancov/AArch64/print_coverage_pcs.test
+++ b/llvm/test/tools/sancov/AArch64/print_coverage_pcs.test
@@ -1,4 +1,4 @@
REQUIRES: aarch64-registered-target
-RUN: not sancov -print-coverage-pcs %p/../Inputs/test-linux_android_aarch64 2>&1 | FileCheck %s --check-prefix=AARCH64
+RUN: not sancov -print-coverage-pcs %p/Inputs/test-linux_android_aarch64 2>&1 | FileCheck %s --check-prefix=AARCH64
AARCH64: ERROR: __sanitizer_cov* functions not found
diff --git a/llvm/test/tools/sancov/Inputs/dummy-32bits.0.sancov b/llvm/test/tools/sancov/X86/Inputs/dummy-32bits.0.sancov
similarity index 100%
rename from llvm/test/tools/sancov/Inputs/dummy-32bits.0.sancov
rename to llvm/test/tools/sancov/X86/Inputs/dummy-32bits.0.sancov
diff --git a/llvm/test/tools/sancov/Inputs/foo.cpp b/llvm/test/tools/sancov/X86/Inputs/foo.cpp
similarity index 100%
rename from llvm/test/tools/sancov/Inputs/foo.cpp
rename to llvm/test/tools/sancov/X86/Inputs/foo.cpp
diff --git a/llvm/test/tools/sancov/Inputs/fun_ignorelist.txt b/llvm/test/tools/sancov/X86/Inputs/fun_ignorelist.txt
similarity index 100%
rename from llvm/test/tools/sancov/Inputs/fun_ignorelist.txt
rename to llvm/test/tools/sancov/X86/Inputs/fun_ignorelist.txt
diff --git a/llvm/test/tools/sancov/Inputs/src_ignorelist.txt b/llvm/test/tools/sancov/X86/Inputs/src_ignorelist.txt
similarity index 100%
rename from llvm/test/tools/sancov/Inputs/src_ignorelist.txt
rename to llvm/test/tools/sancov/X86/Inputs/src_ignorelist.txt
diff --git a/llvm/test/tools/sancov/Inputs/test-darwin_x86_64 b/llvm/test/tools/sancov/X86/Inputs/test-darwin_x86_64
similarity index 100%
rename from llvm/test/tools/sancov/Inputs/test-darwin_x86_64
rename to llvm/test/tools/sancov/X86/Inputs/test-darwin_x86_64
diff --git a/llvm/test/tools/sancov/Inputs/test-linux_x86_64 b/llvm/test/tools/sancov/X86/Inputs/test-linux_x86_64
similarity index 100%
rename from llvm/test/tools/sancov/Inputs/test-linux_x86_64
rename to llvm/test/tools/sancov/X86/Inputs/test-linux_x86_64
diff --git a/llvm/test/tools/sancov/Inputs/test-linux_x86_64.0.sancov b/llvm/test/tools/sancov/X86/Inputs/test-linux_x86_64.0.sancov
similarity index 100%
rename from llvm/test/tools/sancov/Inputs/test-linux_x86_64.0.sancov
rename to llvm/test/tools/sancov/X86/Inputs/test-linux_x86_64.0.sancov
diff --git a/llvm/test/tools/sancov/Inputs/test-linux_x86_64.0.symcov b/llvm/test/tools/sancov/X86/Inputs/test-linux_x86_64.0.symcov
similarity index 100%
rename from llvm/test/tools/sancov/Inputs/test-linux_x86_64.0.symcov
rename to llvm/test/tools/sancov/X86/Inputs/test-linux_x86_64.0.symcov
diff --git a/llvm/test/tools/sancov/Inputs/test-linux_x86_64.1.sancov b/llvm/test/tools/sancov/X86/Inputs/test-linux_x86_64.1.sancov
similarity index 100%
rename from llvm/test/tools/sancov/Inputs/test-linux_x86_64.1.sancov
rename to llvm/test/tools/sancov/X86/Inputs/test-linux_x86_64.1.sancov
diff --git a/llvm/test/tools/sancov/Inputs/test-linux_x86_64.1.symcov b/llvm/test/tools/sancov/X86/Inputs/test-linux_x86_64.1.symcov
similarity index 100%
rename from llvm/test/tools/sancov/Inputs/test-linux_x86_64.1.symcov
rename to llvm/test/tools/sancov/X86/Inputs/test-linux_x86_64.1.symcov
diff --git a/llvm/test/tools/sancov/Inputs/test-windows_x86_64 b/llvm/test/tools/sancov/X86/Inputs/test-windows_x86_64
similarity index 100%
rename from llvm/test/tools/sancov/Inputs/test-windows_x86_64
rename to llvm/test/tools/sancov/X86/Inputs/test-windows_x86_64
diff --git a/llvm/test/tools/sancov/Inputs/test.cpp b/llvm/test/tools/sancov/X86/Inputs/test.cpp
similarity index 100%
rename from llvm/test/tools/sancov/Inputs/test.cpp
rename to llvm/test/tools/sancov/X86/Inputs/test.cpp
diff --git a/llvm/test/tools/sancov/covered_functions.test b/llvm/test/tools/sancov/X86/covered_functions.test
similarity index 100%
rename from llvm/test/tools/sancov/covered_functions.test
rename to llvm/test/tools/sancov/X86/covered_functions.test
diff --git a/llvm/test/tools/sancov/diff-different-bitness.test b/llvm/test/tools/sancov/X86/diff-different-bitness.test
similarity index 100%
rename from llvm/test/tools/sancov/diff-different-bitness.test
rename to llvm/test/tools/sancov/X86/diff-different-bitness.test
diff --git a/llvm/test/tools/sancov/diff-different-files.test b/llvm/test/tools/sancov/X86/diff-different-files.test
similarity index 100%
rename from llvm/test/tools/sancov/diff-different-files.test
rename to llvm/test/tools/sancov/X86/diff-different-files.test
diff --git a/llvm/test/tools/sancov/diff-same-file.test b/llvm/test/tools/sancov/X86/diff-same-file.test
similarity index 100%
rename from llvm/test/tools/sancov/diff-same-file.test
rename to llvm/test/tools/sancov/X86/diff-same-file.test
diff --git a/llvm/test/tools/sancov/ignorelist.test b/llvm/test/tools/sancov/X86/ignorelist.test
similarity index 100%
rename from llvm/test/tools/sancov/ignorelist.test
rename to llvm/test/tools/sancov/X86/ignorelist.test
diff --git a/llvm/test/tools/sancov/X86/lit.local.cfg b/llvm/test/tools/sancov/X86/lit.local.cfg
new file mode 100644
index 0000000000000..3787dac2804a1
--- /dev/null
+++ b/llvm/test/tools/sancov/X86/lit.local.cfg
@@ -0,0 +1 @@
+config.requires = ['x86-registered-target']
diff --git a/llvm/test/tools/sancov/merge.test b/llvm/test/tools/sancov/X86/merge.test
similarity index 100%
rename from llvm/test/tools/sancov/merge.test
rename to llvm/test/tools/sancov/X86/merge.test
diff --git a/llvm/test/tools/sancov/not_covered_functions.test b/llvm/test/tools/sancov/X86/not_covered_functions.test
similarity index 100%
rename from llvm/test/tools/sancov/not_covered_functions.test
rename to llvm/test/tools/sancov/X86/not_covered_functions.test
diff --git a/llvm/test/tools/sancov/print.test b/llvm/test/tools/sancov/X86/print.test
similarity index 100%
rename from llvm/test/tools/sancov/print.test
rename to llvm/test/tools/sancov/X86/print.test
diff --git a/llvm/test/tools/sancov/print_coverage_pcs.test b/llvm/test/tools/sancov/X86/print_coverage_pcs.test
similarity index 100%
rename from llvm/test/tools/sancov/print_coverage_pcs.test
rename to llvm/test/tools/sancov/X86/print_coverage_pcs.test
diff --git a/llvm/test/tools/sancov/stats.test b/llvm/test/tools/sancov/X86/stats.test
similarity index 100%
rename from llvm/test/tools/sancov/stats.test
rename to llvm/test/tools/sancov/X86/stats.test
diff --git a/llvm/test/tools/sancov/symbolize.test b/llvm/test/tools/sancov/X86/symbolize.test
similarity index 100%
rename from llvm/test/tools/sancov/symbolize.test
rename to llvm/test/tools/sancov/X86/symbolize.test
diff --git a/llvm/test/tools/sancov/symbolize_noskip_dead_files.test b/llvm/test/tools/sancov/X86/symbolize_noskip_dead_files.test
similarity index 100%
rename from llvm/test/tools/sancov/symbolize_noskip_dead_files.test
rename to llvm/test/tools/sancov/X86/symbolize_noskip_dead_files.test
diff --git a/llvm/test/tools/sancov/union-different-bitness.test b/llvm/test/tools/sancov/X86/union-different-bitness.test
similarity index 100%
rename from llvm/test/tools/sancov/union-different-bitness.test
rename to llvm/test/tools/sancov/X86/union-different-bitness.test
diff --git a/llvm/test/tools/sancov/union-different-files.test b/llvm/test/tools/sancov/X86/union-different-files.test
similarity index 100%
rename from llvm/test/tools/sancov/union-different-files.test
rename to llvm/test/tools/sancov/X86/union-different-files.test
diff --git a/llvm/test/tools/sancov/union-same-file.test b/llvm/test/tools/sancov/X86/union-same-file.test
similarity index 100%
rename from llvm/test/tools/sancov/union-same-file.test
rename to llvm/test/tools/sancov/X86/union-same-file.test
diff --git a/llvm/test/tools/sancov/validation.test b/llvm/test/tools/sancov/X86/validation.test
similarity index 100%
rename from llvm/test/tools/sancov/validation.test
rename to llvm/test/tools/sancov/X86/validation.test
diff --git a/llvm/test/tools/sancov/XCOFF/lit.local.cfg b/llvm/test/tools/sancov/XCOFF/lit.local.cfg
new file mode 100644
index 0000000000000..3d33f4d55784e
--- /dev/null
+++ b/llvm/test/tools/sancov/XCOFF/lit.local.cfg
@@ -0,0 +1 @@
+config.requires = ['powerpc-registered-target']
diff --git a/llvm/test/tools/sancov/lit.local.cfg b/llvm/test/tools/sancov/lit.local.cfg
deleted file mode 100644
index e52b44e619ca3..0000000000000
--- a/llvm/test/tools/sancov/lit.local.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-# These tests require a registered x86 backend.
-
-if not "X86" in config.root.targets:
- config.unsupported = True
More information about the llvm-commits
mailing list