drodriguez created this revision.
drodriguez added reviewers: JDevlieghere, labath, xiaobai.
Herald added a subscriber: mgorny.
drodriguez requested review of this revision.
Herald added a project: LLDB.
Herald added a subscriber: lldb-commits.
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.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D102889
Files:
lldb/test/API/CMakeLists.txt
lldb/test/CMakeLists.txt
lldb/test/Shell/CMakeLists.txt
lldb/test/Unit/CMakeLists.txt
lldb/utils/lldb-dotest/CMakeLists.txt
lldb/utils/lldb-repro/CMakeLists.txt
Index: lldb/utils/lldb-repro/CMakeLists.txt
===================================================================
--- lldb/utils/lldb-repro/CMakeLists.txt
+++ lldb/utils/lldb-repro/CMakeLists.txt
@@ -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.
Index: lldb/utils/lldb-dotest/CMakeLists.txt
===================================================================
--- lldb/utils/lldb-dotest/CMakeLists.txt
+++ lldb/utils/lldb-dotest/CMakeLists.txt
@@ -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)
Index: lldb/test/Unit/CMakeLists.txt
===================================================================
--- lldb/test/Unit/CMakeLists.txt
+++ lldb/test/Unit/CMakeLists.txt
@@ -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}
Index: lldb/test/Shell/CMakeLists.txt
===================================================================
--- lldb/test/Shell/CMakeLists.txt
+++ lldb/test/Shell/CMakeLists.txt
@@ -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}
Index: lldb/test/CMakeLists.txt
===================================================================
--- lldb/test/CMakeLists.txt
+++ lldb/test/CMakeLists.txt
@@ -31,12 +31,16 @@
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 @@
${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 @@
${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)
Index: lldb/test/API/CMakeLists.txt
===================================================================
--- lldb/test/API/CMakeLists.txt
+++ lldb/test/API/CMakeLists.txt
@@ -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 @@
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
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
