Skip to content

Commit bd04ef6

Browse files
Revert "[clangd] Make lit tests work with the internal shell"
This reverts commit 9c414c4. This one is causing buildbot failures too at CMake configure time: 1. https://lab.llvm.org/buildbot/#/builders/193/builds/12452
1 parent 4cfbc44 commit bd04ef6

File tree

4 files changed

+6
-10
lines changed

4 files changed

+6
-10
lines changed

clang-tools-extra/clangd/test/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ set(CLANGD_TEST_DEPS
33
ClangdTests
44
clangd-indexer
55
split-file
6-
IndexBenchmark
76
)
87

98
if(CLANGD_BUILD_XPC)

clang-tools-extra/clangd/test/include-cleaner-batch-fix.test

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
# RUN: cp -r %S/Inputs/include-cleaner %t/include
88
# RUN: echo '-I%t/include' > %t/compile_flags.txt
99
# Create a config file enabling include-cleaner features.
10-
# RUN: echo 'Diagnostics:' > %t/clangd/config.yaml
11-
# RUN: echo ' UnusedIncludes: Strict' >> %t/clangd/config.yaml
12-
# RUN: echo ' MissingIncludes: Strict' >> %t/clangd/config.yaml
10+
# RUN: echo $'Diagnostics:\n UnusedIncludes: Strict\n MissingIncludes: Strict' >> %t/clangd/config.yaml
1311

1412
# RUN: env XDG_CONFIG_HOME=%t clangd -lit-test -enable-config --compile-commands-dir=%t < %s | FileCheck -strict-whitespace %s
1513
{"jsonrpc":"2.0","id":0,"method":"initialize","params":{"processId":123,"rootPath":"clangd","capabilities":{"workspace":{"workspaceEdit":{"documentChanges":true, "changeAnnotationSupport":{"groupsOnLabel":true}}}},"trace":"off"}}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Paths are not constructed correctly for the test to run on Windows.
2-
# UNSUPPORTED: system-windows
31
# RUN: clangd-indexer %p/Inputs/BenchmarkSource.cpp -- -I%p/Inputs > %t.index
4-
# RUN: %clangd-benchmark-dir/IndexBenchmark %t.index %p/Inputs/requests.json --benchmark_min_time=0.01
2+
# 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.
3+
# REQUIRES: shell
4+
# RUN: if [ -f %clangd-benchmark-dir/IndexBenchmark ]; then %clangd-benchmark-dir/IndexBenchmark %t.index %p/Inputs/requests.json --benchmark_min_time=0.01 ; fi
55
# Pass invalid JSON file and check that IndexBenchmark fails to parse it.
6-
# RUN: not %clangd-benchmark-dir/IndexBenchmark %t.index %t --benchmark_min_time=0.01
6+
# RUN: if [ -f %clangd-benchmark-dir/IndexBenchmark ]; then not %clangd-benchmark-dir/IndexBenchmark %t.index %t --benchmark_min_time=0.01 ; fi

clang-tools-extra/clangd/test/system-include-extractor.test

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55

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

0 commit comments

Comments
 (0)