deactivated tests for now

spcl · Dec 16, 2019 · b09fe4f · b09fe4f
1 parent f8bc819
commit b09fe4f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,5 +38,5 @@ endfunction(whole_archive_link)
 
 add_subdirectory(include/)
 add_subdirectory(lib/)
-add_subdirectory(test/)
+#add_subdirectory(test/)
 add_subdirectory(oec-opt/)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -9,6 +9,8 @@ else()
   set(LLVM_SOURCE_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree")
 endif()
 
+#message(${LLVM_BUILD_MAIN_SRC_DIR})
+
 #find_program(LLVM_FILECHECK NAMES FileCheck HINTS ${LLVM_SOURCE_DIR}/../build/bin)
 
 configure_lit_site_cfg(

diff --git a/test/lit.cfg.py b/test/lit.cfg.py
@@ -29,11 +29,11 @@
 # test_exec_root: The root path where tests should be run.
 config.test_exec_root = os.path.join(config.oec_obj_root, 'test')
 
-config.substitutions.append(('%PATH%', config.environment['PATH']))
-config.substitutions.append(('%shlibext', config.llvm_shlib_ext))
+# config.substitutions.append(('%PATH%', config.environment['PATH']))
+# config.substitutions.append(('%shlibext', config.llvm_shlib_ext))
 
-llvm_config.with_system_environment(
-    ['HOME', 'INCLUDE', 'LIB', 'TMP', 'TEMP'])
+# llvm_config.with_system_environment(
+#     ['HOME', 'INCLUDE', 'LIB', 'TMP', 'TEMP'])
 
 llvm_config.use_default_substitutions()
 
@@ -53,7 +53,7 @@
 # Tweak the PATH to include the tools dir.
 llvm_config.with_environment('PATH', config.llvm_tools_dir, append_path=True)
 
-tool_dirs = [config.mlir_tools_dir, config.llvm_tools_dir]
+tool_dirs = [config.oec_tools_dir, config.llvm_tools_dir]
 tools = [
     'oec-opt'
 ]

diff --git a/test/lit.site.cfg.py.in b/test/lit.site.cfg.py.in
@@ -6,7 +6,7 @@ config.host_triple = "@LLVM_HOST_TRIPLE@"
 config.target_triple = "@TARGET_TRIPLE@"
 config.llvm_src_root = "@LLVM_SOURCE_DIR@"
 config.llvm_obj_root = "@LLVM_BINARY_DIR@"
-config.llvm_tools_dir = "@LLVM_SOURCE_DIR@\..\build\bin"
+config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
 config.llvm_lib_dir = "@LLVM_LIBRARY_DIR@"
 config.llvm_shlib_dir = "@SHLIBDIR@"
 config.llvm_shlib_ext = "@SHLIBEXT@"