[clang-tools-extra] Remove use of REQUIRES: shell #173313
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
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.
🪟 Windows x64 Test Results
✅ The build succeeded and all tests passed. |
boomanaiden154 requested review from HerrCai0907 and vbvictor and removed request for HerrCai0907 
Member
| @llvm/pr-subscribers-clang-tools-extra @llvm/pr-subscribers-clang-tidy Author: Aiden Grossman (boomanaiden154) ChangesREQUIRES: 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. Full diff: https://github.com/llvm/llvm-project/pull/173313.diff 4 Files Affected:
diff --git a/clang-tools-extra/clangd/test/system-include-extractor.test b/clang-tools-extra/clangd/test/system-include-extractor.test index 861d2e188a1f8..6e7bb5f9e063d 100644 --- a/clang-tools-extra/clangd/test/system-include-extractor.test +++ b/clang-tools-extra/clangd/test/system-include-extractor.test @@ -1,7 +1,7 @@ # RUN: rm -rf %t.dir && mkdir -p %t.dir # The mock driver below is a shell script: -# REQUIRES: shell +# UNSUPPORTED: system-windows # Create a bin directory to store the mock-driver and add it to the path # RUN: mkdir -p %t.dir/bin 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..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,7 +1,8 @@ +// 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 -// 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..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,4 +1,5 @@ -// REQUIRES: shell +// 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 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 |
Member
| @llvm/pr-subscribers-clangd Author: Aiden Grossman (boomanaiden154) ChangesREQUIRES: 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. Full diff: https://github.com/llvm/llvm-project/pull/173313.diff 4 Files Affected:
diff --git a/clang-tools-extra/clangd/test/system-include-extractor.test b/clang-tools-extra/clangd/test/system-include-extractor.test index 861d2e188a1f8..6e7bb5f9e063d 100644 --- a/clang-tools-extra/clangd/test/system-include-extractor.test +++ b/clang-tools-extra/clangd/test/system-include-extractor.test @@ -1,7 +1,7 @@ # RUN: rm -rf %t.dir && mkdir -p %t.dir # The mock driver below is a shell script: -# REQUIRES: shell +# UNSUPPORTED: system-windows # Create a bin directory to store the mock-driver and add it to the path # RUN: mkdir -p %t.dir/bin 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..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,7 +1,8 @@ +// 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 -// 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..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,4 +1,5 @@ -// REQUIRES: shell +// 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 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 |
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
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.