[lld] 505ddb6 - [lld][test] Delete empty Unit test directory

Keith Smiley via llvm-commits llvm-commits at lists.llvm.org
Thu May 19 12:06:51 PDT 2022


Author: Keith Smiley
Date: 2022-05-19T12:06:42-07:00
New Revision: 505ddb6b745038a00b27999e98f2f2c8ff5e43e9

URL: https://github.com/llvm/llvm-project/commit/505ddb6b745038a00b27999e98f2f2c8ff5e43e9
DIFF: https://github.com/llvm/llvm-project/commit/505ddb6b745038a00b27999e98f2f2c8ff5e43e9.diff

LOG: [lld][test] Delete empty Unit test directory

This became empty when we removed the legacy macho lld. This results in
a warning when running `check-lld`. We can revert this in the future if
we want unit tests.

Differential Revision: https://reviews.llvm.org/D125436

Added: 
    

Modified: 
    lld/test/CMakeLists.txt

Removed: 
    lld/test/Unit/lit.cfg.py
    lld/test/Unit/lit.site.cfg.py.in


################################################################################
diff  --git a/lld/test/CMakeLists.txt b/lld/test/CMakeLists.txt
index 9c4dd2b277349..e3562444d7bcd 100644
--- a/lld/test/CMakeLists.txt
+++ b/lld/test/CMakeLists.txt
@@ -14,12 +14,6 @@ configure_lit_site_cfg(
   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
index dac9f5dc6c33f..0000000000000
--- 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
index 70ff63a4d9223..0000000000000
--- a/lld/test/Unit/lit.site.cfg.py.in
+++ /dev/null
@@ -1,17 +0,0 @@
- at 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")


        


More information about the llvm-commits mailing list