diff --git a/lld/test/CMakeLists.txt b/lld/test/CMakeLists.txt --- a/lld/test/CMakeLists.txt +++ b/lld/test/CMakeLists.txt @@ -14,12 +14,6 @@ MAIN_CONFIG ${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py ) -configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.py.in - ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg.py - MAIN_CONFIG - ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.cfg.py - ) set(LLD_TEST_DEPS lld) if (NOT LLD_BUILT_STANDALONE) diff --git a/lld/test/Unit/lit.cfg.py b/lld/test/Unit/lit.cfg.py deleted file mode 100644 --- a/lld/test/Unit/lit.cfg.py +++ /dev/null @@ -1,37 +0,0 @@ -# -*- Python -*- - -# Configuration file for the 'lit' test runner. - -import os - -import lit.formats - -# name: The name of this test suite. -config.name = 'lld-Unit' - -# suffixes: A list of file extensions to treat as test files. -config.suffixes = [] - -# test_source_root: The root path where unit test binaries are located. -# test_exec_root: The root path where tests should be run. -config.test_source_root = os.path.join(config.lld_obj_root, 'unittests') -config.test_exec_root = config.test_source_root - - -# Tweak the PATH to include the tools dir. -path = os.path.pathsep.join((config.lld_tools_dir, config.llvm_tools_dir, config.environment['PATH'])) -config.environment['PATH'] = path - -path = os.path.pathsep.join((config.lld_libs_dir, config.llvm_libs_dir, - config.environment.get('LD_LIBRARY_PATH',''))) -config.environment['LD_LIBRARY_PATH'] = path - -# Propagate LLVM_SRC_ROOT into the environment. -config.environment['LLVM_SRC_ROOT'] = config.llvm_src_root - -# Propagate PYTHON_EXECUTABLE into the environment -config.environment['PYTHON_EXECUTABLE'] = sys.executable - - -# testFormat: The test format to use to interpret tests. -config.test_format = lit.formats.GoogleTest(config.llvm_build_mode, 'Tests') diff --git a/lld/test/Unit/lit.site.cfg.py.in b/lld/test/Unit/lit.site.cfg.py.in deleted file mode 100644 --- a/lld/test/Unit/lit.site.cfg.py.in +++ /dev/null @@ -1,17 +0,0 @@ -@LIT_SITE_CFG_IN_HEADER@ - -config.llvm_src_root = "@LLVM_SOURCE_DIR@" -config.llvm_obj_root = "@LLVM_BINARY_DIR@" -config.llvm_tools_dir = lit_config.substitute("@LLVM_TOOLS_DIR@") -config.llvm_libs_dir = lit_config.substitute("@LLVM_LIBS_DIR@") -config.llvm_build_mode = lit_config.substitute("@LLVM_BUILD_MODE@") -config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@" -config.lld_obj_root = "@LLD_BINARY_DIR@" -config.lld_src_root = "@LLD_SOURCE_DIR@" -config.lld_libs_dir = lit_config.substitute("@CURRENT_LIBS_DIR@") -config.lld_tools_dir = lit_config.substitute("@CURRENT_TOOLS_DIR@") -config.target_triple = "@LLVM_TARGET_TRIPLE@" -config.python_executable = "@Python3_EXECUTABLE@" - -# Let the main config do the real work. -lit_config.load_config(config, "@LLD_SOURCE_DIR@/test/Unit/lit.cfg.py")