From bf932867acc003f4dd5bf4d8b295f764a3a85c91 Mon Sep 17 00:00:00 2001 From: Aiden Grossman Date: Tue, 23 Dec 2025 12:04:13 -0800 Subject: [PATCH] [compiler-rt] Remove REQUIRES: shell lines (#173338) The shell feature only implies that we are not running on Windows now that the internal shell is enabled by default everywhere. Remove where we can and rewrite to the more intentional UNSUPPORTED: system-windows when we still need to prevent tests from running on Windows. --- .../test/asan/TestCases/Linux/allocator_oom_test.cpp | 2 +- compiler-rt/test/asan/TestCases/Posix/deep_call_stack.cpp | 1 - compiler-rt/test/asan/TestCases/log-path_test.cpp | 5 +---- compiler-rt/test/asan/TestCases/scariness_score_test.cpp | 6 +++--- compiler-rt/test/fuzzer/features_dir.test | 2 +- compiler-rt/test/fuzzer/fork-sigusr.test | 1 - compiler-rt/test/fuzzer/merge-posix.test | 1 - compiler-rt/test/fuzzer/merge-sigusr.test | 1 - compiler-rt/test/fuzzer/sigint.test | 2 +- compiler-rt/test/fuzzer/sigusr.test | 1 - compiler-rt/test/fuzzer/ulimit.test | 3 ++- compiler-rt/test/hwasan/TestCases/print-memory-usage.c | 3 ++- compiler-rt/test/memprof/TestCases/log_path_test.cpp | 3 --- compiler-rt/test/msan/Linux/reexec_unlimited_stack.cpp | 1 - compiler-rt/test/profile/instrprof-hostname.c | 3 ++- 15 files changed, 13 insertions(+), 22 deletions(-) diff --git a/compiler-rt/test/asan/TestCases/Linux/allocator_oom_test.cpp b/compiler-rt/test/asan/TestCases/Linux/allocator_oom_test.cpp index c51e11fcb348..c6f516e203c7 100644 --- a/compiler-rt/test/asan/TestCases/Linux/allocator_oom_test.cpp +++ b/compiler-rt/test/asan/TestCases/Linux/allocator_oom_test.cpp @@ -43,7 +43,7 @@ // ASan shadow memory on s390 is too large for this test. // AArch64 bots fail on this test. // TODO(alekseys): Android lit do not run ulimit on device. -// REQUIRES: shell, shadow-scale-3 +// REQUIRES: shadow-scale-3 // UNSUPPORTED: android, target={{(s390|aarch64|powerpc64le).*}} #include diff --git a/compiler-rt/test/asan/TestCases/Posix/deep_call_stack.cpp b/compiler-rt/test/asan/TestCases/Posix/deep_call_stack.cpp index c4e519fa6183..991d7fc5f516 100644 --- a/compiler-rt/test/asan/TestCases/Posix/deep_call_stack.cpp +++ b/compiler-rt/test/asan/TestCases/Posix/deep_call_stack.cpp @@ -1,5 +1,4 @@ // Check that UAR mode can handle very deep recursion. -// REQUIRES: shell // TODO(boomanaiden154): This test currently fails with the internal // shell because python is not able to set RLIMIT_STACK. We should // reenable this when the behavior is fixed. diff --git a/compiler-rt/test/asan/TestCases/log-path_test.cpp b/compiler-rt/test/asan/TestCases/log-path_test.cpp index 22f077fb5468..410e36ec5fec 100644 --- a/compiler-rt/test/asan/TestCases/log-path_test.cpp +++ b/compiler-rt/test/asan/TestCases/log-path_test.cpp @@ -1,9 +1,6 @@ // FIXME: https://code.google.com/p/address-sanitizer/issues/detail?id=316 // UNSUPPORTED: ios, android // -// The for loop in the backticks below requires bash. -// REQUIRES: shell -// // RUN: %clangxx_asan %s -o %t // Regular run. @@ -35,7 +32,7 @@ // RUN: not cat %t.log.* // FIXME: log_path is not supported on Windows yet. -// XFAIL: target={{.*windows-msvc.*}} +// UNSUPPORTED: system-windows #include #include diff --git a/compiler-rt/test/asan/TestCases/scariness_score_test.cpp b/compiler-rt/test/asan/TestCases/scariness_score_test.cpp index 51ae040670bf..8e5ccec4ff26 100644 --- a/compiler-rt/test/asan/TestCases/scariness_score_test.cpp +++ b/compiler-rt/test/asan/TestCases/scariness_score_test.cpp @@ -73,11 +73,11 @@ // RUN: not %run %t 27 2>&1 | FileCheck %s --check-prefix=CHECK27 // Parts of the test are too platform-specific: // REQUIRES: x86_64-target-arch -// REQUIRES: shell // TODO(boomanaiden154): This test currently fails with the internal // shell because python is not able to set RLIMIT_STACK. We should -// reenable this when the behavior is fixed. -// UNSUPPORTED: system-darwin +// reenable this when the behavior is fixed. Windows does not support +// ulimit. +// UNSUPPORTED: system-darwin, system-windows #include #include #include diff --git a/compiler-rt/test/fuzzer/features_dir.test b/compiler-rt/test/fuzzer/features_dir.test index ce63b3920708..c6beec01bc3a 100644 --- a/compiler-rt/test/fuzzer/features_dir.test +++ b/compiler-rt/test/fuzzer/features_dir.test @@ -1,5 +1,5 @@ # Tests -features_dir=F -# REQUIRES: linux, shell +# REQUIRES: linux RUN: %cpp_compiler %S/SimpleTest.cpp -o %t-SimpleTest RUN: rm -rf %t-C %t-F RUN: mkdir %t-C %t-F diff --git a/compiler-rt/test/fuzzer/fork-sigusr.test b/compiler-rt/test/fuzzer/fork-sigusr.test index 088e63cae431..4f796171fbd1 100644 --- a/compiler-rt/test/fuzzer/fork-sigusr.test +++ b/compiler-rt/test/fuzzer/fork-sigusr.test @@ -1,6 +1,5 @@ # Check that libFuzzer honors SIGUSR1/SIGUSR2 # Disabled on Windows which does not have SIGUSR1/SIGUSR2. -REQUIRES: shell UNSUPPORTED: darwin, target={{.*windows.*}}, target=aarch64{{.*}} RUN: rm -rf %t RUN: mkdir -p %t diff --git a/compiler-rt/test/fuzzer/merge-posix.test b/compiler-rt/test/fuzzer/merge-posix.test index 6e37651e6fd2..7df12f45c743 100644 --- a/compiler-rt/test/fuzzer/merge-posix.test +++ b/compiler-rt/test/fuzzer/merge-posix.test @@ -1,4 +1,3 @@ -REQUIRES: shell XFAIL: ios RUN: %cpp_compiler %S/FullCoverageSetTest.cpp -o %t-FullCoverageSetTest diff --git a/compiler-rt/test/fuzzer/merge-sigusr.test b/compiler-rt/test/fuzzer/merge-sigusr.test index 4e492775400b..762ae0d106d2 100644 --- a/compiler-rt/test/fuzzer/merge-sigusr.test +++ b/compiler-rt/test/fuzzer/merge-sigusr.test @@ -1,7 +1,6 @@ # Check that libFuzzer honors SIGUSR1/SIGUSR2 # FIXME: Disabled on Windows for now because of reliance on posix only features # (eg: export, "&", pkill). -REQUIRES: shell UNSUPPORTED: darwin, target={{.*windows.*}} RUN: rm -rf %t RUN: mkdir -p %t diff --git a/compiler-rt/test/fuzzer/sigint.test b/compiler-rt/test/fuzzer/sigint.test index ac482d79b8e2..0e239c3ce538 100644 --- a/compiler-rt/test/fuzzer/sigint.test +++ b/compiler-rt/test/fuzzer/sigint.test @@ -1,4 +1,4 @@ -REQUIRES: shell, msan +REQUIRES: msan UNSUPPORTED: target=arm{{.*}} # Check that libFuzzer exits gracefully under SIGINT with MSan. diff --git a/compiler-rt/test/fuzzer/sigusr.test b/compiler-rt/test/fuzzer/sigusr.test index c8a77ac63a6d..c3d7adf8ea99 100644 --- a/compiler-rt/test/fuzzer/sigusr.test +++ b/compiler-rt/test/fuzzer/sigusr.test @@ -1,6 +1,5 @@ # FIXME: Disabled on Windows for now because of reliance on posix only features # (eg: export, "&", pkill). -REQUIRES: shell UNSUPPORTED: darwin, target={{.*windows.*}} # Check that libFuzzer honors SIGUSR1/SIGUSR2 RUN: rm -rf %t diff --git a/compiler-rt/test/fuzzer/ulimit.test b/compiler-rt/test/fuzzer/ulimit.test index e330a97cc07c..a33af49117f6 100644 --- a/compiler-rt/test/fuzzer/ulimit.test +++ b/compiler-rt/test/fuzzer/ulimit.test @@ -1,4 +1,5 @@ -REQUIRES: shell +# Requires ulimit +UNSUPPORTED: system-windows RUN: %cpp_compiler %S/SimpleTest.cpp -o %t-SimpleTest RUN: ulimit -s 1000 RUN: not %run %t-SimpleTest diff --git a/compiler-rt/test/hwasan/TestCases/print-memory-usage.c b/compiler-rt/test/hwasan/TestCases/print-memory-usage.c index 13652fbd921b..b7e1e780e37e 100644 --- a/compiler-rt/test/hwasan/TestCases/print-memory-usage.c +++ b/compiler-rt/test/hwasan/TestCases/print-memory-usage.c @@ -1,5 +1,6 @@ // Tests __hwasan_print_memory_usage. -// REQUIRES: shell +// Requires ulimit +// UNSUPPORTED: system-windows // RUN: %clang_hwasan %s -o %t // RUN: ulimit -s 1000 // RUN: %run %t 2>&1 | FileCheck %s diff --git a/compiler-rt/test/memprof/TestCases/log_path_test.cpp b/compiler-rt/test/memprof/TestCases/log_path_test.cpp index 683ca67122c3..4c38bd56ebb6 100644 --- a/compiler-rt/test/memprof/TestCases/log_path_test.cpp +++ b/compiler-rt/test/memprof/TestCases/log_path_test.cpp @@ -1,6 +1,3 @@ -// The for loop in the backticks below requires bash. -// REQUIRES: shell -// // RUN: %clangxx_memprof %s -o %t // stderr log_path diff --git a/compiler-rt/test/msan/Linux/reexec_unlimited_stack.cpp b/compiler-rt/test/msan/Linux/reexec_unlimited_stack.cpp index 8dee27047470..61492ec34533 100644 --- a/compiler-rt/test/msan/Linux/reexec_unlimited_stack.cpp +++ b/compiler-rt/test/msan/Linux/reexec_unlimited_stack.cpp @@ -1,6 +1,5 @@ // MSAN re-execs on unlimited stacks. We use that to verify ReExec() uses the // right path. -// REQUIRES: shell // RUN: %clangxx_msan -O0 %s -o %t && ulimit -s unlimited && %run %t | FileCheck %s #include diff --git a/compiler-rt/test/profile/instrprof-hostname.c b/compiler-rt/test/profile/instrprof-hostname.c index c0b3426eeaa8..b2bc26d26d38 100644 --- a/compiler-rt/test/profile/instrprof-hostname.c +++ b/compiler-rt/test/profile/instrprof-hostname.c @@ -3,7 +3,8 @@ // RUN: %run uname -n | tr -d '\n' > %t.n // RUN: llvm-profdata merge -o %t.profdata %{readfile:%t.n}.%t-%{readfile:%t.n}.profraw_%{readfile:%t.n} // RUN: %clang_profuse=%t.profdata -o - -S -emit-llvm %s | FileCheck %s -// REQUIRES: shell +// Requires uname +// UNSUPPORTED: system-windows int main(int argc, const char *argv[]) { // CHECK: br i1 %{{.*}}, label %{{.*}}, label %{{.*}}, !prof ![[PD1:[0-9]+]]