Skip to content

Commit

Permalink
check-clang-tools: Actually build and run XPC test
Browse files Browse the repository at this point in the history
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.

Differential Revision: https://reviews.llvm.org/D60120

llvm-svn: 357719
  • Loading branch information
nico committed Apr 4, 2019
1 parent a040174 commit e028de4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions clang-tools-extra/test/CMakeLists.txt
Expand Up @@ -17,7 +17,7 @@ string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} CLANG_TOOLS_DIR ${LLVM_RUN

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
Expand Down Expand Up @@ -70,7 +70,7 @@ set(CLANG_TOOLS_TEST_DEPS
clang
)

if(CLANGD_BUILD_XPC_SUPPORT)
if(CLANGD_BUILD_XPC)
list(APPEND CLANG_TOOLS_TEST_DEPS clangd-xpc-test-client)
endif()

Expand Down
2 changes: 1 addition & 1 deletion clang-tools-extra/test/lit.site.cfg.py.in
Expand Up @@ -11,7 +11,7 @@ config.clang_libs_dir = "@SHLIBDIR@"
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.
Expand Down

0 comments on commit e028de4

Please sign in to comment.