Author: Daniel RodrÃguez Troitiño Date: 2021-05-21T00:10:27-07:00 New Revision: 5e327785da36fa3a00767cfea0a47fcb0f0814aa
URL: https://github.com/llvm/llvm-project/commit/5e327785da36fa3a00767cfea0a47fcb0f0814aa DIFF: https://github.com/llvm/llvm-project/commit/5e327785da36fa3a00767cfea0a47fcb0f0814aa.diff LOG: [lldb] Match test dependencies name to other LLVM projects. 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 Added: Modified: 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 Removed: ################################################################################ diff --git a/lldb/test/API/CMakeLists.txt b/lldb/test/API/CMakeLists.txt index ce7531fd98665..7625a4e5e29c7 100644 --- a/lldb/test/API/CMakeLists.txt +++ b/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 @@ 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 diff --git a/lldb/test/CMakeLists.txt b/lldb/test/CMakeLists.txt index c6b01c66a0ef2..584cacbb99c1a 100644 --- a/lldb/test/CMakeLists.txt +++ b/lldb/test/CMakeLists.txt @@ -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) diff --git a/lldb/test/Shell/CMakeLists.txt b/lldb/test/Shell/CMakeLists.txt index f0d7b9a34651b..123bee6164537 100644 --- a/lldb/test/Shell/CMakeLists.txt +++ b/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} diff --git a/lldb/test/Unit/CMakeLists.txt b/lldb/test/Unit/CMakeLists.txt index 3233c0873c1fb..a592e1cb1a1fc 100644 --- a/lldb/test/Unit/CMakeLists.txt +++ b/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} diff --git a/lldb/utils/lldb-dotest/CMakeLists.txt b/lldb/utils/lldb-dotest/CMakeLists.txt index 5b7522835acd1..aab3f363a54bd 100644 --- a/lldb/utils/lldb-dotest/CMakeLists.txt +++ b/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) diff --git a/lldb/utils/lldb-repro/CMakeLists.txt b/lldb/utils/lldb-repro/CMakeLists.txt index a496e99861993..725cb66c4755e 100644 --- a/lldb/utils/lldb-repro/CMakeLists.txt +++ b/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. _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
