[clangd] Add "check-clangd" target

[hokein]

Summary

So we don't have to run "check-clang-tools" (which builds and tests all
clang tools) to verify our clangd-related change. It'd save waiting time for
clangd developers.

check-clangd (build ~1000 files, run ~340 tests) vs check-clang-tools (build
~3000 files, run ~1000 tests).

In the future, we probably want to add similar target for other
clang-tools (e.g. clang-tidy).

[sammccall]

Thanks for doing this!
Sorry for the dumb questions, I don't get cmake.

test/CMakeLists.txt

36 ↗

(On Diff #167680)

can we add all of clangd to this list with a loop, instead of duplicating?

76 ↗

(On Diff #167680)

Conversely, I'd consider just expanding these out into each of the dep lists rather than keeping two levels of indirection here.

107 ↗

(On Diff #167680)

Is /Unit/ really right?

[hokein]

test/CMakeLists.txt

36 ↗

(On Diff #167680)

We could do this, or alternatively we can remove all clangd-related binaries, and add check-clangd target. The only difference is that the output will change a bit, like below, I think this is not a big deal, WDYT?

[0/2] Running the Clangd regression tests
Testing Time: 2.78s
  Expected Passes    : 343
  Unsupported Tests  : 1
[1/2] Running the Clang extra tools' regression tests
Testing Time: 4.08s
  Expected Passes    : 1001
  Unsupported Tests  : 2

107 ↗

(On Diff #167680)

Yes, indeed. It is used for running unittest (we have lit configuration file in test/Unit/ directory).

[sammccall]

Awesome! Please do remove that duplication if it's easy.

test/CMakeLists.txt

36 ↗

(On Diff #167680)

Yes, that looks great!

[hokein]

Remove clangd-binary dep in check-clang-tools, and use check-clangd.

[hokein]

test/CMakeLists.txt

76 ↗

(On Diff #167680)

Ah, I missed this comment. It seems that there is no elegant way to expand these to CLANG_TOOLS_TEST_DEPS and CLANGD_TOOLS_TEST_DEPS, we have to repeat the code twice. So I'd prefer using macro to eliminate code duplication.

[sammccall]

test/CMakeLists.txt

76 ↗

(On Diff #167680)

Right, that was my suggestion: instead of 13 lines of macros, to add "FileCheck count not" twice, we just write it twice. It won't change often, and if it does there's no reason to assume you'd want them in sync.

[hokein]

Remove llvm util dependencies (we move it to add_lit_target().

[sammccall]

Awesome, thanks!

[ilya-biryukov]

This is awesome! Can't wait for it to land!

[hokein]

Need someone stamps on https://reviews.llvm.org/D52713 before landing this patch :)

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

set(CLANG_TOOLS_TEST_DEPS
   clang-rename
 
   # For the clang-doc tests that emit bitcode files.
   llvm-bcanalyzer
 
   # Individual tools we test.
   clang-apply-replacements
   clang-change-namespace
-  clangd
   clang-doc
   clang-include-fixer
   clang-move
   clang-query
   clang-reorder-fields
   find-all-symbols
   modularize
   pp-trace
 
-  # These individual tools have no tests, add them here to make them compile
-  # together with check-clang-tools, so that we won't break them in the future.
-  clangd-indexer
-  dexp
+  check-clangd
 
   # Unit tests
   ExtraToolsUnitTests
   )
 
 if(CLANG_ENABLE_STATIC_ANALYZER)
   list(APPEND CLANG_TOOLS_TEST_DEPS
     # For the clang-tidy libclang integration test.
     c-index-test
     # clang-tidy tests require it.
     clang-headers
 
     clang-tidy
     )
 endif()
 
-set(llvm_utils
-  FileCheck count not
-  )
-
-foreach(t ${llvm_utils})
-  if(TARGET ${t})
-    list(APPEND CLANG_TOOLS_TEST_DEPS ${t})
-  endif()
-endforeach()
-
 add_lit_testsuite(check-clang-tools "Running the Clang extra tools' regression tests"
   ${CMAKE_CURRENT_BINARY_DIR}
   DEPENDS ${CLANG_TOOLS_TEST_DEPS}
   ARGS ${CLANG_TOOLS_TEST_EXTRA_ARGS}
   )
 
 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
+)
+add_lit_testsuite(check-clangd "Running the Clangd regression tests"
+  ${CMAKE_CURRENT_BINARY_DIR}/Unit/clangd;${CMAKE_CURRENT_BINARY_DIR}/clangd
+  DEPENDS ${CLANGD_TEST_DEPS}
+)
+set_target_properties(check-clangd PROPERTIES FOLDER "Clangd tests")