Make check-clang depend on the clang-check binary always

[thakis]

Summary

check-clang (the target that runs all clang tests) used to
only depend on clang-check (a binary like clang-tidy,
clang-refactor, etc) if the static analyzer is enabled.
However, several lit tests call clang-check unconditionally,
so always depend on it.

Fixes a "could not find clang-check" lit warning in clean builds with
the static analyzer disabled.

Also sort the deps in the CMake file and put just one dep on each line.

[rnk]

lgtm

clang/test/CMakeLists.txt

configure_lit_site_cfg(
   )
 
 option(CLANG_TEST_USE_VG "Run Clang tests under Valgrind" OFF)
 if(CLANG_TEST_USE_VG)
   set(CLANG_TEST_EXTRA_ARGS ${CLANG_TEST_EXTRA_ARGS} "--vg")
 endif ()
 
 list(APPEND CLANG_TEST_DEPS
-  clang clang-resource-headers
+  c-index-test
+  clang
+  clang-resource-headers
+  clang-check
   clang-format
-  c-index-test diagtool
   clang-tblgen
   clang-offload-bundler
   clang-import-test
   clang-rename
   clang-refactor
   clang-diff
+  diagtool
   hmaptool
   )
   
 if(CLANG_ENABLE_STATIC_ANALYZER)
   list(APPEND CLANG_TEST_DEPS
-    clang-check
     clang-extdef-mapping
     )
 endif()
 
 if (CLANG_ENABLE_ARCMT)
   list(APPEND CLANG_TEST_DEPS
     arcmt-test
     c-arcmt-test

llvm/utils/gn/secondary/clang/test/BUILD.gn

 # //:default depends on it, so that ninja's default target builds all
 # prerequisites for check-clang but doesn't run check-clang itself.
 group("test") {
   deps = [
     ":lit_site_cfg",
     ":lit_unit_site_cfg",
     "//clang/lib/Headers",
     "//clang/tools/c-index-test",
+    "//clang/tools/clang-check",
     "//clang/tools/clang-diff",
     "//clang/tools/clang-format",
     "//clang/tools/clang-import-test",
     "//clang/tools/clang-offload-bundler",
     "//clang/tools/clang-refactor",
     "//clang/tools/clang-rename",
     "//clang/tools/diagtool",
     "//clang/tools/driver:symlinks",
group("test") {
   if (clang_enable_arcmt) {
     deps += [
       "//clang/tools/arcmt-test",
       "//clang/tools/c-arcmt-test",
     ]
   }
   if (clang_enable_static_analyzer) {
     deps += [
-      "//clang/tools/clang-check",
       "//clang/tools/clang-extdef-mapping",
     ]
   }
 
   # FIXME: clang_build_examples
   testonly = true
 }