maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[clangd] Don't make check-clangd as a dependency in check-clang-tools 

Summary:
check-clang-tools will run check-clangd first, and then run the rest
tests. If clangd tests fails, check-clang-tools would be stopped.

This would block other clang-tools developers if clangd is broken.

Reviewers: sammccall

Subscribers: mgorny, ilya-biryukov, ioeric, MaskRay, jkorous, arphaman, kadircet, cfe-commits

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

llvm-svn: 343608
This commit is contained in:
Haojian Wu 2018-10-02 17:22:11 +00:00
parent a70ece45eb
commit 795f6ed51c
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
clang-tools-extra/test/CMakeLists.txt
View File

@ -52,8 +52,6 @@ set(CLANG_TOOLS_TEST_DEPS
modularize modularize
pp-trace pp-trace
check-clangd
# Unit tests # Unit tests
ExtraToolsUnitTests ExtraToolsUnitTests
@ -65,6 +63,19 @@ set(CLANG_TOOLS_TEST_DEPS
clang-tidy clang-tidy
) )
set(CLANGD_TEST_DEPS
clangd
ClangdTests
# clangd-related tools which don't have tests, add them to the test to make
# sure we don't introduce new changes that break their compilations.
clangd-indexer
dexp
)
foreach(clangd_dep ${CLANGD_TEST_DEPS})
list(APPEND CLANG_TOOLS_TEST_DEPS
${clangd_dep})
endforeach()
add_lit_testsuite(check-clang-tools "Running the Clang extra tools' regression tests" add_lit_testsuite(check-clang-tools "Running the Clang extra tools' regression tests"
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${CLANG_TOOLS_TEST_DEPS} DEPENDS ${CLANG_TOOLS_TEST_DEPS}
@ -74,15 +85,9 @@ add_lit_testsuite(check-clang-tools "Running the Clang extra tools' regression t
set_target_properties(check-clang-tools PROPERTIES FOLDER "Clang extra tools' tests") set_target_properties(check-clang-tools PROPERTIES FOLDER "Clang extra tools' tests")
# Setup an individual test for building and testing clangd-only stuff. # Setup an individual test for building and testing clangd-only stuff.
set(CLANGD_TEST_DEPS # Note: all clangd tests have been covered in check-clang-tools, this is a
clangd # convenient target for clangd developers.
ClangdTests # Exclude check-clangd from check-all.
# clangd-related tools which don't have tests, add them to the test to make
# sure we don't introduce new changes that break their compilations.
clangd-indexer
dexp
)
# Exclude check-clangd from check-all, as check-clangd will launch via check-clang-tools.
set(EXCLUDE_FROM_ALL ON) set(EXCLUDE_FROM_ALL ON)
add_lit_testsuite(check-clangd "Running the Clangd regression tests" add_lit_testsuite(check-clangd "Running the Clangd regression tests"
${CMAKE_CURRENT_BINARY_DIR}/Unit/clangd;${CMAKE_CURRENT_BINARY_DIR}/clangd ${CMAKE_CURRENT_BINARY_DIR}/Unit/clangd;${CMAKE_CURRENT_BINARY_DIR}/clangd