diff options
| author | Kadir Cetinkaya <kadircet@google.com> | 2023-05-16 08:41:56 +0200 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2023-05-16 22:03:06 -0700 |
| commit | ae42196bc493ffe877a7e3dff8be32035dea4d07 (patch) | |
| tree | f52208e9d93a2eb3925ffb7370498f6076f5650a | |
| parent | 21f3dfbc26736e4299c154e67065652f48279047 (diff) | |
| download | llvm-ae42196bc493ffe877a7e3dff8be32035dea4d07.tar.gz | |
[clangd] Fix builds after 4ddae8b941398a6579d3llvmorg-16.0.4
(cherry picked from commit 9ffef0f24de0fc05b946e662a7b233a32ad058e3)
| -rw-r--r-- | clang-tools-extra/clangd/test/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | clang-tools-extra/clangd/test/compile_commands.json | 1 |
2 files changed, 5 insertions, 9 deletions
diff --git a/clang-tools-extra/clangd/test/CMakeLists.txt b/clang-tools-extra/clangd/test/CMakeLists.txt index 840fe2bdc12b..d073267066e0 100644 --- a/clang-tools-extra/clangd/test/CMakeLists.txt +++ b/clang-tools-extra/clangd/test/CMakeLists.txt @@ -28,14 +28,11 @@ configure_lit_site_cfg( ${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py ) -# Copy an empty compile_commands.json to override the compile_commands.json -# in the top level build directory. Or if a clangd test involves creating a -# temporary source file in the build directory and run clangd to check it, -# it can pick up unrecognizable command options when LLVM is built with -# another compiler or a different version of Clang. -configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/compile_commands.json - ${CMAKE_CURRENT_BINARY_DIR}/compile_commands.json +# Copy an empty compile_flags.txt to make sure tests don't pick up arbitrary +# commands from parents. +file( + TOUCH + ${CMAKE_CURRENT_BINARY_DIR}/compile_flags.txt ) add_lit_testsuite(check-clangd "Running the Clangd regression tests" diff --git a/clang-tools-extra/clangd/test/compile_commands.json b/clang-tools-extra/clangd/test/compile_commands.json deleted file mode 100644 index fe51488c7066..000000000000 --- a/clang-tools-extra/clangd/test/compile_commands.json +++ /dev/null @@ -1 +0,0 @@ -[] |