Author: Kadir Cetinkaya Date: 2023-05-16T08:44:53+02:00 New Revision: 9ffef0f24de0fc05b946e662a7b233a32ad058e3
URL: https://github.com/llvm/llvm-project/commit/9ffef0f24de0fc05b946e662a7b233a32ad058e3 DIFF: https://github.com/llvm/llvm-project/commit/9ffef0f24de0fc05b946e662a7b233a32ad058e3.diff LOG: [clangd] Fix builds after 4ddae8b941398a6579d3 Added: Modified: clang-tools-extra/clangd/test/CMakeLists.txt Removed: clang-tools-extra/clangd/test/compile_commands.json ################################################################################ diff --git a/clang-tools-extra/clangd/test/CMakeLists.txt b/clang-tools-extra/clangd/test/CMakeLists.txt index 840fe2bdc12b0..d073267066e0b 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 diff erent 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 fe51488c7066f..0000000000000 --- a/clang-tools-extra/clangd/test/compile_commands.json +++ /dev/null @@ -1 +0,0 @@ -[] _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
