https://github.com/cmtice updated https://github.com/llvm/llvm-project/pull/156950
>From 05fa2572ad23795ef821b81ecd5dd4ff4d0aea7a Mon Sep 17 00:00:00 2001 From: Caroline Tice <cmt...@google.com> Date: Thu, 4 Sep 2025 12:00:44 -0700 Subject: [PATCH 1/2] [clang-tools-extra] Remove 'REQUIRES: shell' from lit tests. As preparation for making lit use the internal shell by default in clang-tools-extra (withe significant expected performance gains), this removes 'REQUIRES: shell' from the clang-tools-extra lit tests that have it, and updates the one test that was not passing with 'LIT_USE_INTERNAL_SHELL=1' to now pass with the internal shell. --- .../test/clang-include-fixer/multiple_fixes.cpp | 1 - .../test/clang-tidy/infrastructure/clang-tidy-diff.cpp | 1 - .../test/clang-tidy/infrastructure/file-filter-symlinks.cpp | 2 -- .../inheritance/subfolder/bar.cpp | 6 ++++-- .../test/clang-tidy/infrastructure/pr37091.cpp | 1 - .../test/clang-tidy/infrastructure/vfsoverlay.cpp | 1 - 6 files changed, 4 insertions(+), 8 deletions(-) diff --git a/clang-tools-extra/test/clang-include-fixer/multiple_fixes.cpp b/clang-tools-extra/test/clang-include-fixer/multiple_fixes.cpp index 6c82e2a4749ae..3db706bd27f23 100644 --- a/clang-tools-extra/test/clang-include-fixer/multiple_fixes.cpp +++ b/clang-tools-extra/test/clang-include-fixer/multiple_fixes.cpp @@ -1,4 +1,3 @@ -// REQUIRES: shell // RUN: sed -e 's#//.*$##' %s > %t.cpp // RUN: mkdir -p %t.dir/clang-include-fixer/multiple-fixes // RUN: echo 'foo f;' > %t.dir/clang-include-fixer/multiple-fixes/foo.cpp diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-diff.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-diff.cpp index 25be90fb49587..92a31acb1f8d7 100644 --- a/clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-diff.cpp +++ b/clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-diff.cpp @@ -1,4 +1,3 @@ -// REQUIRES: shell // RUN: sed 's/placeholder_for_f/f/' %s > %t.cpp // RUN: clang-tidy -checks=-*,modernize-use-override %t.cpp -- -std=c++11 | FileCheck -check-prefix=CHECK-SANITY %s // RUN: not diff -U0 %s %t.cpp | %clang_tidy_diff -checks=-*,modernize-use-override -- -std=c++11 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-JMAX diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/file-filter-symlinks.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/file-filter-symlinks.cpp index 58f3b23cb1dbf..a978d514186e9 100644 --- a/clang-tools-extra/test/clang-tidy/infrastructure/file-filter-symlinks.cpp +++ b/clang-tools-extra/test/clang-tidy/infrastructure/file-filter-symlinks.cpp @@ -1,5 +1,3 @@ -// REQUIRES: shell - // RUN: rm -rf %t // RUN: mkdir -p %t/dir1/dir2 // RUN: echo 'class A { A(int); };' > %t/dir1/header.h diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/header-filter-from-config-file/inheritance/subfolder/bar.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/header-filter-from-config-file/inheritance/subfolder/bar.cpp index 229ba52e2695a..9517c3d5a16a6 100644 --- a/clang-tools-extra/test/clang-tidy/infrastructure/header-filter-from-config-file/inheritance/subfolder/bar.cpp +++ b/clang-tools-extra/test/clang-tidy/infrastructure/header-filter-from-config-file/inheritance/subfolder/bar.cpp @@ -1,6 +1,8 @@ // shell is required for the "dirname" command -// REQUIRES: shell -// RUN: clang-tidy -checks=-*,google-explicit-constructor %s -- -I "$(dirname %S)" 2>&1 | FileCheck %s +// RUN: pushd %S +// RUN: cd .. +// RUN: clang-tidy -checks=-*,google-explicit-constructor %s -- -I "." 2>&1 | FileCheck %s +// RUN: popd #include "foo.h" // CHECK-NOT: foo.h:1:12: warning: single-argument constructors must be marked explicit diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/pr37091.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/pr37091.cpp index 6772e9d29f34d..a07149c20c325 100644 --- a/clang-tools-extra/test/clang-tidy/infrastructure/pr37091.cpp +++ b/clang-tools-extra/test/clang-tidy/infrastructure/pr37091.cpp @@ -1,4 +1,3 @@ -// REQUIRES: shell // RUN: rm -rf %t // RUN: mkdir -p %t diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/vfsoverlay.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/vfsoverlay.cpp index 5704b71fd10ea..d3040c6fc469c 100644 --- a/clang-tools-extra/test/clang-tidy/infrastructure/vfsoverlay.cpp +++ b/clang-tools-extra/test/clang-tidy/infrastructure/vfsoverlay.cpp @@ -1,6 +1,5 @@ // RUN: sed -e "s:INPUT_DIR:%S/Inputs/vfsoverlay:g" -e "s:OUT_DIR:%t:g" %S/Inputs/vfsoverlay/vfsoverlay.yaml > %t.yaml // RUN: clang-tidy %s -checks='-*,modernize-use-nullptr' -vfsoverlay %t.yaml -- -I %t | FileCheck %s -// REQUIRES: shell #include "not_real.h" >From 36a7cd0b45cb79dd29ba793fdca17d26b650ea28 Mon Sep 17 00:00:00 2001 From: Caroline Tice <cmt...@google.com> Date: Mon, 8 Sep 2025 10:57:24 -0700 Subject: [PATCH 2/2] Mark failing windows tests as unsupported. These tests had been marked as "REQUIRES: shell". They fail when that is removed. Since they never ran on Windows (due to the 'REQUIRES: shell' annotation), mark them as unsupported. --- .../test/clang-tidy/infrastructure/clang-tidy-diff.cpp | 1 + .../inheritance/subfolder/bar.cpp | 2 +- clang-tools-extra/test/clang-tidy/infrastructure/vfsoverlay.cpp | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-diff.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-diff.cpp index 92a31acb1f8d7..43b7d781e6a7a 100644 --- a/clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-diff.cpp +++ b/clang-tools-extra/test/clang-tidy/infrastructure/clang-tidy-diff.cpp @@ -1,3 +1,4 @@ +// UNSUPPORTED: system-windows // RUN: sed 's/placeholder_for_f/f/' %s > %t.cpp // RUN: clang-tidy -checks=-*,modernize-use-override %t.cpp -- -std=c++11 | FileCheck -check-prefix=CHECK-SANITY %s // RUN: not diff -U0 %s %t.cpp | %clang_tidy_diff -checks=-*,modernize-use-override -- -std=c++11 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-JMAX diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/header-filter-from-config-file/inheritance/subfolder/bar.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/header-filter-from-config-file/inheritance/subfolder/bar.cpp index 9517c3d5a16a6..3f0a5f86a4092 100644 --- a/clang-tools-extra/test/clang-tidy/infrastructure/header-filter-from-config-file/inheritance/subfolder/bar.cpp +++ b/clang-tools-extra/test/clang-tidy/infrastructure/header-filter-from-config-file/inheritance/subfolder/bar.cpp @@ -1,4 +1,4 @@ -// shell is required for the "dirname" command +// UNSUPPORTED: system-windows // RUN: pushd %S // RUN: cd .. // RUN: clang-tidy -checks=-*,google-explicit-constructor %s -- -I "." 2>&1 | FileCheck %s diff --git a/clang-tools-extra/test/clang-tidy/infrastructure/vfsoverlay.cpp b/clang-tools-extra/test/clang-tidy/infrastructure/vfsoverlay.cpp index d3040c6fc469c..9f3cc1c85ce2a 100644 --- a/clang-tools-extra/test/clang-tidy/infrastructure/vfsoverlay.cpp +++ b/clang-tools-extra/test/clang-tidy/infrastructure/vfsoverlay.cpp @@ -1,3 +1,4 @@ +// UNSUPPORTED: system-windows // RUN: sed -e "s:INPUT_DIR:%S/Inputs/vfsoverlay:g" -e "s:OUT_DIR:%t:g" %S/Inputs/vfsoverlay/vfsoverlay.yaml > %t.yaml // RUN: clang-tidy %s -checks='-*,modernize-use-nullptr' -vfsoverlay %t.yaml -- -I %t | FileCheck %s _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits