X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FCMakeLists.txt;h=392f5f218ecb7abfc846e5b7a5612c5f62dd8939;hb=c48b55a33dc5cd898dc9e58c0a1650b8f24c3879;hp=651d0243f14a9b9ca40aecb2360305f6544f3fbe;hpb=33219d48c2e31ec5541fbdccc10cc43147183122;p=oota-llvm.git

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 651d0243f14..392f5f218ec 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -7,20 +7,59 @@ 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.
+set(LLVM_TEST_DEPENDS
+          UnitTests
+          BugpointPasses
+          LLVMHello
+          llc
+          lli
+          llvm-ar
+          llvm-as
+          llvm-bcanalyzer
+          llvm-cov
+          llvm-diff
+          llvm-dis
+          llvm-extract
+          llvm-dwarfdump
+          llvm-link
+          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 UnitTests
-          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")
 
 # 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")