X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FCMakeLists.txt;h=373b1eec7c25fc2fbdce98e0d21ecbfef2c4bfdb;hb=63735e79ff83cf8b123231cceac10903b3d0ef22;hp=ea7b7ab2d4b04f15a199e67bcfb7276804a0a2a1;hpb=e45658cc3c47d21140ee8680fb22bf664a996fbd;p=oota-llvm.git

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index ea7b7ab2d4b..373b1eec7c2 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -7,22 +7,64 @@ configure_lit_site_cfg(
   ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg
   )
 
+# Don't include check-llvm into check-all without LLVM_BUILD_TOOLS.
+if(NOT LLVM_BUILD_TOOLS)
+  set(EXCLUDE_FROM_ALL ON)
+endif()
+
+# Set the depends list as a variable so that it can grow conditionally.
+# NOTE: Sync the substitutions in test/lit.cfg when adding to this list.
+set(LLVM_TEST_DEPENDS
+          llvm-config
+          UnitTests
+          BugpointPasses
+          LLVMHello
+          llc
+          lli
+          lli-child-target
+          llvm-ar
+          llvm-as
+          llvm-bcanalyzer
+          llvm-c-test
+          llvm-cov
+          llvm-diff
+          llvm-dis
+          llvm-extract
+          llvm-dwarfdump
+          llvm-link
+          llvm-lto
+          llvm-mc
+          llvm-mcmarkup
+          llvm-nm
+          llvm-objdump
+          llvm-readobj
+          llvm-rtdyld
+          llvm-symbolizer
+          macho-dump
+          opt
+          profile_rt-shared
+          FileCheck
+          count
+          not
+          yaml2obj
+          obj2yaml
+        )
+
+# If Intel JIT events are supported, depend on a tool that tests the listener.
+if( LLVM_USE_INTEL_JITEVENTS )
+  set(LLVM_TEST_DEPENDS ${LLVM_TEST_DEPENDS} llvm-jitlistener)
+endif( LLVM_USE_INTEL_JITEVENTS )
+
 add_lit_testsuite(check-llvm "Running the LLVM regression tests"
   ${CMAKE_CURRENT_BINARY_DIR}
   PARAMS llvm_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
          llvm_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg
-  DEPENDS BugpointPasses LLVMHello
-          llc lli llvm-ar llvm-as llvm-dis llvm-extract llvm-dwarfdump
-          llvm-link llvm-mc llvm-nm llvm-objdump llvm-readobj
-          macho-dump opt
-          FileCheck count not
+  DEPENDS ${LLVM_TEST_DEPENDS}
   )
 set_target_properties(check-llvm PROPERTIES FOLDER "Tests")
-# Note, this is kept here rather than in the DEPENDS above because of bugs in
-# some CMake versions that mishandle the dependency otherwise.
-add_dependencies(check-llvm UnitTests)
 
 # Setup a legacy alias for 'check-llvm'. This will likely change to be an
 # alias for 'check-all' at some point in the future.
-add_custom_target(check DEPENDS check-llvm)
+add_custom_target(check)
+add_dependencies(check check-llvm)
 set_target_properties(check PROPERTIES FOLDER "Tests")