Skip to content

Commit 1364750

Browse files
committed
[RFC][debuginfo-test] Rename debug-info lit tests for general purposes
Discussion thread: https://lists.llvm.org/pipermail/llvm-dev/2021-January/148048.html Move debuginfo-test into a subdirectory of a new top-level directory, called cross-project-tests. The new name replaces "debuginfo-test" as an LLVM project enabled via LLVM_ENABLE_PROJECTS. Differential Revision: https://reviews.llvm.org/D95339 Reviewed by: aprantl
1 parent f996725 commit 1364750

File tree

230 files changed

+15
-14
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

230 files changed

+15
-14
lines changed

README.md

Lines changed: 1 addition & 1 deletion

debuginfo-tests/CMakeLists.txt renamed to cross-project-tests/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
find_package(Python3 COMPONENTS Interpreter)
66

77
add_llvm_executable(check-gdb-llvm-support
8-
llvm-prettyprinters/gdb/llvm-support.cpp
8+
debuginfo-tests/llvm-prettyprinters/gdb/llvm-support.cpp
99
)
1010
target_link_libraries(check-gdb-llvm-support PRIVATE LLVMSupport)
1111

@@ -24,7 +24,7 @@ set(DEBUGINFO_TEST_DEPS
2424

2525
if ("mlir" IN_LIST LLVM_ENABLE_PROJECTS)
2626
add_llvm_executable(check-gdb-mlir-support
27-
llvm-prettyprinters/gdb/mlir-support.cpp
27+
debuginfo-tests/llvm-prettyprinters/gdb/mlir-support.cpp
2828
)
2929
target_include_directories(check-gdb-mlir-support PRIVATE
3030
${LLVM_EXTERNAL_MLIR_SOURCE_DIR}/include
@@ -61,7 +61,7 @@ configure_lit_site_cfg(
6161
${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py
6262
)
6363

64-
add_lit_testsuite(check-debuginfo "Running debug info integration tests"
64+
add_lit_testsuite(check-debuginfo "Running cross-project tests"
6565
${CMAKE_CURRENT_BINARY_DIR}
6666
DEPENDS ${DEBUGINFO_TEST_DEPS}
6767
)
@@ -71,4 +71,4 @@ add_lit_testsuites(DEBUGINFO ${CMAKE_CURRENT_SOURCE_DIR}
7171
DEPENDS ${DEBUGINFO_TEST_DEPS}
7272
)
7373

74-
set_target_properties(check-debuginfo PROPERTIES FOLDER "Debug info tests")
74+
set_target_properties(check-debuginfo PROPERTIES FOLDER "Tests")

debuginfo-tests/lit.cfg.py renamed to cross-project-tests/lit.cfg.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
config.excludes = ['Inputs']
3333

3434
# test_source_root: The root path where tests are located.
35-
config.test_source_root = os.path.join(config.debuginfo_tests_src_root)
35+
config.test_source_root = config.debuginfo_tests_src_root
3636

3737
# test_exec_root: The root path where tests should be run.
3838
config.test_exec_root = config.debuginfo_tests_obj_root
@@ -41,7 +41,8 @@
4141

4242
tools = [
4343
ToolSubst('%test_debuginfo', command=os.path.join(
44-
config.debuginfo_tests_src_root, 'llgdb-tests', 'test_debuginfo.pl')),
44+
config.debuginfo_tests_src_root, 'debuginfo-tests',
45+
'llgdb-tests', 'test_debuginfo.pl')),
4546
ToolSubst("%llvm_src_root", config.llvm_src_root),
4647
ToolSubst("%llvm_tools_dir", config.llvm_tools_dir),
4748
]
@@ -126,7 +127,7 @@ def can_target_host():
126127
# Produce dexter path, lldb path, and combine into the %dexter substitution
127128
# for running a test.
128129
dexter_path = os.path.join(config.debuginfo_tests_src_root,
129-
'dexter', 'dexter.py')
130+
'debuginfo-tests', 'dexter', 'dexter.py')
130131
dexter_test_cmd = '"{}" "{}" test'.format(sys.executable, dexter_path)
131132
if lldb_path is not None:
132133
dexter_test_cmd += ' --lldb-executable "{}"'.format(lldb_path)

llvm/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ endif()
6464
# LLVM_EXTERNAL_${project}_SOURCE_DIR using LLVM_ALL_PROJECTS
6565
# This allows an easy way of setting up a build directory for llvm and another
6666
# one for llvm+clang+... using the same sources.
67-
set(LLVM_ALL_PROJECTS "clang;clang-tools-extra;compiler-rt;debuginfo-tests;libc;libclc;libcxx;libcxxabi;libunwind;lld;lldb;mlir;openmp;parallel-libs;polly;pstl")
67+
set(LLVM_ALL_PROJECTS "clang;clang-tools-extra;compiler-rt;cross-project-tests;libc;libclc;libcxx;libcxxabi;libunwind;lld;lldb;mlir;openmp;parallel-libs;polly;pstl")
6868
# The flang project is not yet part of "all" projects (see C++ requirements)
6969
set(LLVM_EXTRA_PROJECTS "flang")
7070
# List of all known projects in the mono repo

llvm/docs/CMake.rst

Lines changed: 1 addition & 1 deletion

llvm/docs/GettingStarted.rst

Lines changed: 1 addition & 1 deletion

llvm/docs/TestingGuide.rst

Lines changed: 1 addition & 1 deletion

llvm/projects/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ foreach(entry ${entries})
1212
(NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/test-suite) AND
1313
(NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/parallel-libs) AND
1414
(NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/openmp) AND
15-
(NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/debuginfo-tests))
15+
(NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/cross-project-tests))
1616
get_filename_component(entry_name "${entry}" NAME)
1717
add_llvm_external_project(${entry_name})
1818
endif()
@@ -45,5 +45,5 @@ add_llvm_external_project(parallel-libs)
4545
add_llvm_external_project(openmp)
4646

4747
if(LLVM_INCLUDE_TESTS)
48-
add_llvm_external_project(debuginfo-tests)
48+
add_llvm_external_project(cross-project-tests)
4949
endif()

0 commit comments

Comments
 (0)