shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

[lldb] Match test dependencies name to other LLVM projects.

Browse Source 
Other LLVM projects use the suffix `-depends` for the test dependencies,
however LLDB uses `-deps` and seems to be the only project under the
LLVM to do so.

In order to make the projects more homogeneous, switch all the
references to `lldb-test-deps` to `lldb-test-depends`.

Additionally, provide a compatibility target with the old name and
depending on the new name, in order to not break anyone workflow.

Reviewed By: JDevlieghere

Differential Revision: https://reviews.llvm.org/D102889
This commit is contained in:
Daniel Rodríguez Troitiño 2021-05-21 00:10:17 -07:00 committed by Shoaib Meenai
parent e3eaff10b2
commit 5e327785da
6 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lldb/test/API/CMakeLists.txt
View File

@ -1,5 +1,5 @@
add_custom_target(lldb-api-test-deps)
add_dependencies(lldb-api-test-deps lldb-test-deps)
add_dependencies(lldb-api-test-deps lldb-test-depends)
add_lit_testsuites(LLDB-API
${CMAKE_CURRENT_SOURCE_DIR}
@ -17,7 +17,7 @@ function(add_python_test_target name test_script args comment)
COMMENT "${comment}"
USES_TERMINAL
)
add_dependencies(${name} lldb-test-deps)
add_dependencies(${name} lldb-test-depends)
endfunction()
# The default architecture with which to compile test executables is the

12
lldb/test/CMakeLists.txt
View File

@ -31,12 +31,16 @@ string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLDB_LIBS_DIR ${LLVM_LIBRA
string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLDB_TOOLS_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
# Create a custom target to track test dependencies.
add_custom_target(lldb-test-depends)
set_target_properties(lldb-test-depends PROPERTIES FOLDER "lldb misc")
# Create an alias for the legacy name of lldb-test-depends
add_custom_target(lldb-test-deps)
set_target_properties(lldb-test-deps PROPERTIES FOLDER "lldb misc")
add_dependencies(lldb-test-deps lldb-test-depends)
function(add_lldb_test_dependency)
foreach(dependency ${ARGN})
add_dependencies(lldb-test-deps ${dependency})
add_dependencies(lldb-test-depends ${dependency})
endforeach()
endfunction(add_lldb_test_dependency)
@ -201,7 +205,7 @@ add_lit_testsuite(check-lldb-reproducers-capture
${CMAKE_CURRENT_BINARY_DIR}/Shell
PARAMS "lldb-run-with-repro=capture"
EXCLUDE_FROM_CHECK_ALL
DEPENDS lldb-test-deps)
DEPENDS lldb-test-depends)
# Add a lit test suite that runs the API & shell test by replaying a
# reproducer.
@ -211,7 +215,7 @@ add_lit_testsuite(check-lldb-reproducers
${CMAKE_CURRENT_BINARY_DIR}/Shell
PARAMS "lldb-run-with-repro=replay"
EXCLUDE_FROM_CHECK_ALL
DEPENDS lldb-test-deps)
DEPENDS lldb-test-depends)
add_dependencies(check-lldb-reproducers check-lldb-reproducers-capture)
if(LLDB_BUILT_STANDALONE)

2
lldb/test/Shell/CMakeLists.txt
View File

@ -1,5 +1,5 @@
add_custom_target(lldb-shell-test-deps)
add_dependencies(lldb-shell-test-deps lldb-test-deps)
add_dependencies(lldb-shell-test-deps lldb-test-depends)
add_lit_testsuites(LLDB-SHELL
${CMAKE_CURRENT_SOURCE_DIR}

2
lldb/test/Unit/CMakeLists.txt
View File

@ -1,5 +1,5 @@
add_custom_target(lldb-unit-test-deps)
add_dependencies(lldb-unit-test-deps lldb-test-deps)
add_dependencies(lldb-unit-test-deps lldb-test-depends)
add_lit_testsuites(LLDB-UNIT
${CMAKE_CURRENT_SOURCE_DIR}

2
lldb/utils/lldb-dotest/CMakeLists.txt
View File

@ -1,6 +1,6 @@
# Make lldb-dotest a custom target.
add_custom_target(lldb-dotest)
add_dependencies(lldb-dotest lldb-test-deps)
add_dependencies(lldb-dotest lldb-test-depends)
set_target_properties(lldb-dotest PROPERTIES FOLDER "lldb utils")
get_property(LLDB_DOTEST_ARGS GLOBAL PROPERTY LLDB_DOTEST_ARGS_PROPERTY)

2
lldb/utils/lldb-repro/CMakeLists.txt
View File

@ -1,5 +1,5 @@
add_custom_target(lldb-repro)
add_dependencies(lldb-repro lldb-test-deps)
add_dependencies(lldb-repro lldb-test-depends)
set_target_properties(lldb-repro PROPERTIES FOLDER "lldb utils")
# Generate lldb-repro Python script for each build mode.