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

[Haojian Wu via cfe-commits]

Author: hokein
Date: Tue Oct  2 10:22:11 2018
New Revision: 343608

URL: http://llvm.org/viewvc/llvm-project?rev=343608&view=rev
Log:
[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

Modified:
    clang-tools-extra/trunk/test/CMakeLists.txt

Modified: clang-tools-extra/trunk/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/CMakeLists.txt?rev=343608&r1=343607&r2=343608&view=diff
==============================================================================
--- clang-tools-extra/trunk/test/CMakeLists.txt (original)
+++ clang-tools-extra/trunk/test/CMakeLists.txt Tue Oct  2 10:22:11 2018
@@ -52,8 +52,6 @@ set(CLANG_TOOLS_TEST_DEPS
   modularize
   pp-trace
 
-  check-clangd
-
   # Unit tests
   ExtraToolsUnitTests
 
@@ -65,6 +63,19 @@ set(CLANG_TOOLS_TEST_DEPS
   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"
   ${CMAKE_CURRENT_BINARY_DIR}
   DEPENDS ${CLANG_TOOLS_TEST_DEPS}
@@ -74,15 +85,9 @@ add_lit_testsuite(check-clang-tools "Run
 set_target_properties(check-clang-tools PROPERTIES FOLDER "Clang extra tools' tests")
 
 # Setup an individual test for building and testing clangd-only stuff.
-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
-)
-# Exclude check-clangd from check-all, as check-clangd will launch via check-clang-tools.
+# Note: all clangd tests have been covered in check-clang-tools, this is a
+# convenient target for clangd developers.
+# Exclude check-clangd from check-all.
 set(EXCLUDE_FROM_ALL ON)
 add_lit_testsuite(check-clangd "Running the Clangd regression tests"
   ${CMAKE_CURRENT_BINARY_DIR}/Unit/clangd;${CMAKE_CURRENT_BINARY_DIR}/clangd