https://github.com/boomanaiden154 updated https://github.com/llvm/llvm-project/pull/173313
>From 160d428d5b05f4de256487394220dd39403aada5 Mon Sep 17 00:00:00 2001 From: Aiden Grossman <[email protected]> Date: Mon, 22 Dec 2025 22:13:59 +0000 Subject: [PATCH 1/3] [clang-tools-extra] Remove use of REQUIRES: shell REQUIRES: shell does not have the intended effect now that the internal shell is enabled by default and only prevents tests from running on Windows. This patch removes the directive for portable tests and switches it to a UNSUPPORTED: system-windows tag for non-portable tests to make the intention more clear. --- clang-tools-extra/clangd/test/system-include-extractor.test | 3 --- .../infrastructure/custom-query-check-not-enable.cpp | 1 - .../test/clang-tidy/infrastructure/custom-query-check.cpp | 1 - .../clang-tidy/infrastructure/hide-progress-flag-scripts.cpp | 1 - 4 files changed, 6 deletions(-) diff --git a/clang-tools-extra/clangd/test/system-include-extractor.test b/clang-tools-extra/clangd/test/system-include-extractor.test index 861d2e188a1f8..034cac691dfea 100644 --- a/clang-tools-extra/clangd/test/system-include-extractor.test +++ b/clang-tools-extra/clangd/test/system-include-extractor.test @@ -1,8 +1,5 @@ # RUN: rm -rf %t.dir && mkdir -p %t.dir -# The mock driver below is a shell script: -# REQUIRES: shell - # Create a bin directory to store the mock-driver and add it to the path # RUN: mkdir -p %t.dir/bin # RUN: %python -c "print(__import__('os').environ['PATH'])" | tr -d '\n' > %t.path diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/custom-query-check-not-enable.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/custom-query-check-not-enable.cpp index dc160fbbbcd9e..6f229d9abf76f 100644 --- a/clang-tools-extra/test/clang-tidy/infrastructure/custom-query-check-not-enable.cpp +++ b/clang-tools-extra/test/clang-tidy/infrastructure/custom-query-check-not-enable.cpp @@ -1,7 +1,6 @@ // RUN: sed -e "s:INPUT_DIR:%S/Inputs/custom-query-check:g" -e "s:OUT_DIR:%t:g" -e "s:MAIN_FILE:%s:g" %S/Inputs/custom-query-check/vfsoverlay.yaml > %t.yaml // RUN: clang-tidy --allow-no-checks %t/main.cpp -checks='-*,custom-*' -vfsoverlay %t.yaml | FileCheck %s --check-prefix=CHECK // RUN: clang-tidy --allow-no-checks %t/main.cpp -checks='-*,custom-*' -vfsoverlay %t.yaml --list-checks | FileCheck %s --check-prefix=LIST-CHECK -// REQUIRES: shell long V; diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/custom-query-check.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/custom-query-check.cpp index dc1f3f3754079..cc3f9af94a6f4 100644 --- a/clang-tools-extra/test/clang-tidy/infrastructure/custom-query-check.cpp +++ b/clang-tools-extra/test/clang-tidy/infrastructure/custom-query-check.cpp @@ -1,4 +1,3 @@ -// REQUIRES: shell // REQUIRES: custom-check // RUN: sed -e "s:INPUT_DIR:%S/Inputs/custom-query-check:g" -e "s:OUT_DIR:%t:g" -e "s:MAIN_FILE:%s:g" %S/Inputs/custom-query-check/vfsoverlay.yaml > %t.yaml diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/hide-progress-flag-scripts.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/hide-progress-flag-scripts.cpp index dbc24780ccbda..df69f90fd39d9 100644 --- a/clang-tools-extra/test/clang-tidy/infrastructure/hide-progress-flag-scripts.cpp +++ b/clang-tools-extra/test/clang-tidy/infrastructure/hide-progress-flag-scripts.cpp @@ -11,7 +11,6 @@ // CHECK-RUN-QUIET-NOT: [1/1] // CHECK-RUN-QUIET: 42 is a magic number; -// REQUIRES: shell // RUN: sed 's/42/99/' %s > %t-diff.cpp // RUN: not diff -U0 %s %t-diff.cpp | %clang_tidy_diff -checks=-*,readability-magic-numbers -quiet -hide-progress -- -std=c++11 2>&1 | FileCheck %s --check-prefix=CHECK-DIFF-QUIET >From ed99f045a65981656c05e4d29a06f9750f6398ab Mon Sep 17 00:00:00 2001 From: Aiden Grossman <[email protected]> Date: Tue, 23 Dec 2025 01:11:39 +0000 Subject: [PATCH 2/3] fix --- clang-tools-extra/clangd/test/system-include-extractor.test | 3 +++ .../infrastructure/custom-query-check-not-enable.cpp | 2 ++ 2 files changed, 5 insertions(+) diff --git a/clang-tools-extra/clangd/test/system-include-extractor.test b/clang-tools-extra/clangd/test/system-include-extractor.test index 034cac691dfea..6e7bb5f9e063d 100644 --- a/clang-tools-extra/clangd/test/system-include-extractor.test +++ b/clang-tools-extra/clangd/test/system-include-extractor.test @@ -1,5 +1,8 @@ # RUN: rm -rf %t.dir && mkdir -p %t.dir +# The mock driver below is a shell script: +# UNSUPPORTED: system-windows + # Create a bin directory to store the mock-driver and add it to the path # RUN: mkdir -p %t.dir/bin # RUN: %python -c "print(__import__('os').environ['PATH'])" | tr -d '\n' > %t.path diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/custom-query-check-not-enable.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/custom-query-check-not-enable.cpp index 6f229d9abf76f..3f284fc68f9f3 100644 --- a/clang-tools-extra/test/clang-tidy/infrastructure/custom-query-check-not-enable.cpp +++ b/clang-tools-extra/test/clang-tidy/infrastructure/custom-query-check-not-enable.cpp @@ -1,3 +1,5 @@ +// sed command does not work as-is on Windows. +// UNSUPPORTED: system-windows // RUN: sed -e "s:INPUT_DIR:%S/Inputs/custom-query-check:g" -e "s:OUT_DIR:%t:g" -e "s:MAIN_FILE:%s:g" %S/Inputs/custom-query-check/vfsoverlay.yaml > %t.yaml // RUN: clang-tidy --allow-no-checks %t/main.cpp -checks='-*,custom-*' -vfsoverlay %t.yaml | FileCheck %s --check-prefix=CHECK // RUN: clang-tidy --allow-no-checks %t/main.cpp -checks='-*,custom-*' -vfsoverlay %t.yaml --list-checks | FileCheck %s --check-prefix=LIST-CHECK >From 9356d59557bfe0abbf6ef2c74bea0e737e23606e Mon Sep 17 00:00:00 2001 From: Aiden Grossman <[email protected]> Date: Tue, 23 Dec 2025 01:20:14 +0000 Subject: [PATCH 3/3] fix --- .../test/clang-tidy/infrastructure/custom-query-check.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/custom-query-check.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/custom-query-check.cpp index cc3f9af94a6f4..3a43037b291c9 100644 --- a/clang-tools-extra/test/clang-tidy/infrastructure/custom-query-check.cpp +++ b/clang-tools-extra/test/clang-tidy/infrastructure/custom-query-check.cpp @@ -1,3 +1,5 @@ +// sed command does not work as-is on Windows. +// UNSUPPORTED: system-windows // REQUIRES: custom-check // RUN: sed -e "s:INPUT_DIR:%S/Inputs/custom-query-check:g" -e "s:OUT_DIR:%t:g" -e "s:MAIN_FILE:%s:g" %S/Inputs/custom-query-check/vfsoverlay.yaml > %t.yaml _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
