Skip to content

Commit

Permalink
[CMake] Cleanup check-lldb targets
Browse files Browse the repository at this point in the history
Summary:
This patch adds the following fixes to the check-lldb targets:

* Adds missing dependencies on lldb tools so they get built before tests execute
* Adds Ninja USES_TERMINAL to the target so that the output streams to stdout as it executes
* Uses a generator expression to find the lldb executable, this is more robust than constructing the path manually

Reviewers: tfiala, zturner

Subscribers: mgorny, lldb-commits

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

llvm-svn: 284046
  • Loading branch information
Chris Bieneman committed Oct 12, 2016
1 parent 47df019 commit e549894
Showing 1 changed file with 17 additions and 2 deletions.
19 changes: 17 additions & 2 deletions lldb/test/CMakeLists.txt
Expand Up @@ -8,9 +8,25 @@ function(add_python_test_target name test_script args comment)
add_custom_target(${name}
COMMAND ${PYTHON_TEST_COMMAND} ${ARG_DEFAULT_ARGS}
COMMENT "${comment}"
DEPENDS ${LLDB_TEST_DEPS}
USES_TERMINAL
)
endfunction()

set(LLDB_TEST_DEPS lldb)

if(TARGET lldb-server)
list(APPEND LLDB_TEST_DEPS lldb-server)
endif()

if(TARGET debugserver)
list(APPEND LLDB_TEST_DEPS debugserver)
endif()

if(TARGET lldb-mi)
list(APPEND LLDB_TEST_DEPS lldb-mi)
endif()

if ("${LLDB_TEST_COMPILER}" STREQUAL "")
string(REGEX REPLACE ".*ccache\ +" "" LLDB_TEST_COMPILER ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1})
endif()
Expand All @@ -34,8 +50,7 @@ set(LLDB_TEST_USER_ARGS

set(LLDB_TEST_COMMON_ARGS
--arch=${LLDB_TEST_ARCH}
--executable
${CMAKE_BINARY_DIR}/bin/lldb${CMAKE_EXECUTABLE_SUFFIX}
--executable $<TARGET_FILE:lldb>
-s
${CMAKE_BINARY_DIR}/lldb-test-traces
-S nm
Expand Down

0 comments on commit e549894

Please sign in to comment.