Skip to content

[clangd] Make lit tests work with the internal shell #169539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 26, 2025
+10 −6
Merged

[clangd] Make lit tests work with the internal shell #169539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69fdf37
[𝘀𝗽𝗿] initial version
boomanaiden154 Nov 25, 2025
2fd03c2
rebase
boomanaiden154 Nov 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions clang-tools-extra/clangd/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ set(CLANGD_TEST_DEPS
ClangdTests
clangd-indexer
split-file
IndexBenchmark
)

if(CLANGD_BUILD_XPC)
Expand Down
4 changes: 3 additions & 1 deletion clang-tools-extra/clangd/test/include-cleaner-batch-fix.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
# RUN: cp -r %S/Inputs/include-cleaner %t/include
# RUN: echo '-I%t/include' > %t/compile_flags.txt
# Create a config file enabling include-cleaner features.
# RUN: echo $'Diagnostics:\n UnusedIncludes: Strict\n MissingIncludes: Strict' >> %t/clangd/config.yaml
# RUN: echo 'Diagnostics:' > %t/clangd/config.yaml
# RUN: echo ' UnusedIncludes: Strict' >> %t/clangd/config.yaml
# RUN: echo ' MissingIncludes: Strict' >> %t/clangd/config.yaml

# RUN: env XDG_CONFIG_HOME=%t clangd -lit-test -enable-config --compile-commands-dir=%t < %s | FileCheck -strict-whitespace %s
{"jsonrpc":"2.0","id":0,"method":"initialize","params":{"processId":123,"rootPath":"clangd","capabilities":{"workspace":{"workspaceEdit":{"documentChanges":true, "changeAnnotationSupport":{"groupsOnLabel":true}}}},"trace":"off"}}
Expand Down
8 changes: 4 additions & 4 deletions clang-tools-extra/clangd/test/index-tools.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Paths are not constructed correctly for the test to run on Windows.
Copy link
Contributor

@ilovepi ilovepi Nov 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume this is also a current limitation, so we're not accidentally losing coverage on this?

Copy link
Contributor Author

@boomanaiden154 boomanaiden154 Nov 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah. REQUIRES: shell implies that it does not run on Windows.

This patch actually increases coverage by quite a bit because previously the test would only do anything if you manually built the benchmark target due to the lack of build system dependencies and how the test was constructed.

Copy link
Contributor

@ilovepi ilovepi Nov 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, missed it under the FIXME. thanks.

# UNSUPPORTED: system-windows
# RUN: clangd-indexer %p/Inputs/BenchmarkSource.cpp -- -I%p/Inputs > %t.index
# FIXME: By default, benchmarks are excluded from the list of default targets hence not built. Find a way to depend on benchmarks to run the next command.
# REQUIRES: shell
# RUN: if [ -f %clangd-benchmark-dir/IndexBenchmark ]; then %clangd-benchmark-dir/IndexBenchmark %t.index %p/Inputs/requests.json --benchmark_min_time=0.01 ; fi
# RUN: %clangd-benchmark-dir/IndexBenchmark %t.index %p/Inputs/requests.json --benchmark_min_time=0.01
# Pass invalid JSON file and check that IndexBenchmark fails to parse it.
# RUN: if [ -f %clangd-benchmark-dir/IndexBenchmark ]; then not %clangd-benchmark-dir/IndexBenchmark %t.index %t --benchmark_min_time=0.01 ; fi
# RUN: not %clangd-benchmark-dir/IndexBenchmark %t.index %t --benchmark_min_time=0.01
3 changes: 2 additions & 1 deletion clang-tools-extra/clangd/test/system-include-extractor.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@

# Create a bin directory to store the mock-driver and add it to the path
# RUN: mkdir -p %t.dir/bin
# RUN: export PATH=%t.dir/bin:$PATH
# RUN: %python -c "print(__import__('os').environ['PATH'])" > %t.path
# RUN: export PATH=%t.dir/bin:%{readfile:%t.path}
# Generate a mock-driver that will print %temp_dir%/my/dir and
# %temp_dir%/my/dir2 as include search paths.
# RUN: echo '#!/bin/sh' >> %t.dir/bin/my_driver.sh
Expand Down