X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2FCMakeLists.txt;h=7bb1bddc2d920cad6dc4733c68163434d0c845e0;hb=88484c00307274568ab068909cb38ecaedd41cbf;hp=2db58b9dcc571346053d17b1206aeb0b8ec24ef6;hpb=4383c282af954e4f65ae3b77c891fa41a4960a2a;p=oota-llvm.git

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2db58b9dcc5..7bb1bddc2d9 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -71,6 +71,8 @@ if(PYTHONINTERP_FOUND)
   MAKE_DIRECTORY(${CMAKE_CURRENT_BINARY_DIR}/Unit)
 
   # Configuration-time: See Unit/lit.site.cfg.in
+  set(LLVM_BUILD_MODE "%(build_mode)s")
+
   set(LLVM_SOURCE_DIR ${LLVM_MAIN_SRC_DIR})
   set(LLVM_BINARY_DIR ${LLVM_BINARY_DIR})
   set(LLVM_TOOLS_DIR "${LLVM_TOOLS_BINARY_DIR}/%(build_config)s")
@@ -79,17 +81,16 @@ if(PYTHONINTERP_FOUND)
   set(ENABLE_SHARED ${LLVM_SHARED_LIBS_ENABLED})
   set(SHLIBPATH_VAR ${SHLIBPATH_VAR})
 
-  # lit.site.cfg uses the config-time build mode
-  set(LLVM_BUILD_MODE "${LLVM_BUILD_MODE}")
+  if(LLVM_ENABLE_ASSERTIONS AND NOT MSVC_IDE)
+    set(ENABLE_ASSERTIONS "1")
+  else()
+    set(ENABLE_ASSERTIONS "0")
+  endif()
 
   configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
     ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
     @ONLY)
-
-  # Unit/lit.site.cfg substitutes the runtime build_mode
-  set(LLVM_BUILD_MODE "%(build_mode)s")
-
   configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in
     ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg
@@ -113,7 +114,7 @@ if(PYTHONINTERP_FOUND)
                 UnitTests
                 BugpointPasses LLVMHello
                 llc lli llvm-ar llvm-as llvm-dis llvm-extract
-                llvm-ld llvm-link llvm-mc llvm-nm macho-dump opt
+                llvm-ld llvm-link llvm-mc llvm-nm llvm-objdump macho-dump opt
                 FileCheck count not)
   set_target_properties(check.deps PROPERTIES FOLDER "Tests")