thakis created this revision. thakis added reviewers: jkorous, arphaman. Herald added subscribers: kadircet, dexonsmith, ioeric, ilya-biryukov, mgorny.
The CMake variable controlling if XPC code is built is called `CLANGD_BUILD_XPC` but three places unintentionally checked the non-existent variable `CLANGD_BUILD_XPC_SUPPORT` instead, which (due to being nonexistent, and due to cmake) always silently evaluated to false. Luckily the test still seems to pass, despite never running after being added almost 3 months ago in r351280. https://reviews.llvm.org/D60120 Files: clang-tools-extra/test/CMakeLists.txt clang-tools-extra/test/lit.site.cfg.py.in Index: clang-tools-extra/test/lit.site.cfg.py.in =================================================================== --- clang-tools-extra/test/lit.site.cfg.py.in +++ clang-tools-extra/test/lit.site.cfg.py.in @@ -11,7 +11,7 @@ config.python_executable = "@PYTHON_EXECUTABLE@" config.target_triple = "@TARGET_TRIPLE@" config.clang_staticanalyzer = @CLANG_ENABLE_STATIC_ANALYZER@ -config.clangd_xpc_support = @CLANGD_BUILD_XPC_SUPPORT@ +config.clangd_xpc_support = @CLANGD_BUILD_XPC@ # Support substitution of the tools and libs dirs with user parameters. This is # used when we can't determine the tool dir at configuration time. Index: clang-tools-extra/test/CMakeLists.txt =================================================================== --- clang-tools-extra/test/CMakeLists.txt +++ clang-tools-extra/test/CMakeLists.txt @@ -17,7 +17,7 @@ llvm_canonicalize_cmake_booleans( CLANG_ENABLE_STATIC_ANALYZER - CLANGD_BUILD_XPC_SUPPORT) + CLANGD_BUILD_XPC) configure_lit_site_cfg( ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in @@ -70,7 +70,7 @@ clang ) -if(CLANGD_BUILD_XPC_SUPPORT) +if(CLANGD_BUILD_XPC) list(APPEND CLANG_TOOLS_TEST_DEPS clangd-xpc-test-client) endif()
Index: clang-tools-extra/test/lit.site.cfg.py.in =================================================================== --- clang-tools-extra/test/lit.site.cfg.py.in +++ clang-tools-extra/test/lit.site.cfg.py.in @@ -11,7 +11,7 @@ config.python_executable = "@PYTHON_EXECUTABLE@" config.target_triple = "@TARGET_TRIPLE@" config.clang_staticanalyzer = @CLANG_ENABLE_STATIC_ANALYZER@ -config.clangd_xpc_support = @CLANGD_BUILD_XPC_SUPPORT@ +config.clangd_xpc_support = @CLANGD_BUILD_XPC@ # Support substitution of the tools and libs dirs with user parameters. This is # used when we can't determine the tool dir at configuration time. Index: clang-tools-extra/test/CMakeLists.txt =================================================================== --- clang-tools-extra/test/CMakeLists.txt +++ clang-tools-extra/test/CMakeLists.txt @@ -17,7 +17,7 @@ llvm_canonicalize_cmake_booleans( CLANG_ENABLE_STATIC_ANALYZER - CLANGD_BUILD_XPC_SUPPORT) + CLANGD_BUILD_XPC) configure_lit_site_cfg( ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in @@ -70,7 +70,7 @@ clang ) -if(CLANGD_BUILD_XPC_SUPPORT) +if(CLANGD_BUILD_XPC) list(APPEND CLANG_TOOLS_TEST_DEPS clangd-xpc-test-client) endif()
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits