maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "[lldb] Make the API, Shell and Unit tests independent lit test suites" 

This reverts commit 6c52d4fd4c.
This commit is contained in:
Jonas Devlieghere 2021-03-19 17:57:17 -07:00
parent f9cac39930
commit e76b86642f
7 changed files with 37 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,3 @@
add_custom_target(lldb-api-test-deps)
add_dependencies(lldb-api-test-deps lldb-test-deps)
add_lit_testsuites(LLDB-API
${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS lldb-api-test-deps)
function(add_python_test_target name test_script args comment)
set(PYTHON_TEST_COMMAND
${Python3_EXECUTABLE}
@ -160,35 +153,39 @@ string(REPLACE ${CMAKE_CFG_INTDIR} ${dotest_args_replacement} LLDB_TEST_EXECUTAB
string(REPLACE ${CMAKE_CFG_INTDIR} ${dotest_args_replacement} LLDB_TEST_COMPILER "${LLDB_TEST_COMPILER}")
string(REPLACE ${CMAKE_CFG_INTDIR} ${dotest_args_replacement} LLDB_TEST_DSYMUTIL "${LLDB_TEST_DSYMUTIL}")
# Configure the API test suite.
configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py
MAIN_CONFIG
${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py)
if (CMAKE_GENERATOR STREQUAL "Xcode")
# Xcode does not get the auto-generated targets. We need to create
# check-lldb-api manually.
add_lit_testsuite(check-lldb-api "Running lldb api test suite"
${CMAKE_CURRENT_BINARY_DIR}
DEPENDS lldb-test-deps)
endif()
# Targets for running the test suite on the different Apple simulators.
add_lit_testsuite(check-lldb-simulator-ios
"Running lldb test suite on the iOS simulator"
${CMAKE_CURRENT_BINARY_DIR}
PARAMS "lldb-run-with-simulator=ios"
EXCLUDE_FROM_CHECK_ALL
DEPENDS lldb-api-test-deps)
DEPENDS lldb-test-deps)
add_lit_testsuite(check-lldb-simulator-watchos
"Running lldb test suite on the watchOS simulator"
${CMAKE_CURRENT_BINARY_DIR}
PARAMS "lldb-run-with-simulator=watchos"
EXCLUDE_FROM_CHECK_ALL
DEPENDS lldb-api-test-deps)
DEPENDS lldb-test-deps)
add_lit_testsuite(check-lldb-simulator-tvos
"Running lldb test suite on the tvOS simulator"
${CMAKE_CURRENT_BINARY_DIR}
PARAMS "lldb-run-with-simulator=tvos"
EXCLUDE_FROM_CHECK_ALL
DEPENDS lldb-api-test-deps)
add_lit_testsuite(check-lldb-api "Running lldb api test suite"
${CMAKE_CURRENT_BINARY_DIR}
EXCLUDE_FROM_CHECK_ALL
DEPENDS lldb-api-test-deps)
DEPENDS lldb-test-deps)

5
lldb/test/API/lit.cfg.py
View File

@ -17,10 +17,9 @@ config.name = 'lldb-api'
config.suffixes = ['.py']
# test_source_root: The root path where tests are located.
config.test_source_root = os.path.dirname(__file__)
# test_exec_root: The root path where tests should be run.
config.test_exec_root = os.path.join(config.lldb_obj_root, 'test')
config.test_source_root = os.path.dirname(__file__)
config.test_exec_root = config.test_source_root
def mkdir_p(path):

1
lldb/test/API/lit.site.cfg.py.in
View File

@ -1,5 +1,6 @@
@LIT_SITE_CFG_IN_HEADER@
config.test_exec_root = "@LLDB_BINARY_DIR@"
config.llvm_src_root = "@LLVM_SOURCE_DIR@"
config.llvm_obj_root = "@LLVM_BINARY_DIR@"
config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"

18
lldb/test/CMakeLists.txt
View File

@ -185,13 +185,19 @@ configure_lit_site_cfg(
MAIN_CONFIG
${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py)
add_lit_testsuite(check-lldb "Running lldb lit test suite"
add_lit_testsuites(LLDB
${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS lldb-test-deps)
add_lit_testsuite(check-lldb-lit "Running lldb lit test suite"
${CMAKE_CURRENT_BINARY_DIR}
DEPENDS
lldb-api-test-deps
lldb-shell-test-deps
lldb-unit-test-deps)
set_target_properties(check-lldb PROPERTIES FOLDER "lldb tests")
DEPENDS lldb-test-deps)
set_target_properties(check-lldb-lit PROPERTIES FOLDER "lldb tests")
add_custom_target(check-lldb)
add_dependencies(check-lldb lldb-test-deps)
set_target_properties(check-lldb PROPERTIES FOLDER "lldb misc")
add_dependencies(check-lldb check-lldb-lit)
# Add a lit test suite that runs the API & shell test while capturing a
# reproducer.

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

@ -1,10 +1,4 @@
add_custom_target(lldb-shell-test-deps)
add_dependencies(lldb-shell-test-deps lldb-test-deps)
add_lit_testsuites(LLDB-SHELL
${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS lldb-shell-test-deps)
# Configure the Shell test suite.
configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py
@ -14,7 +8,10 @@ configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/lit-lldb-init.in
${CMAKE_CURRENT_BINARY_DIR}/lit-lldb-init)
add_lit_testsuite(check-lldb-shell "Running lldb shell test suite"
${CMAKE_CURRENT_BINARY_DIR}
EXCLUDE_FROM_CHECK_ALL
DEPENDS lldb-shell-test-deps)
if (CMAKE_GENERATOR STREQUAL "Xcode")
# Xcode does not get the auto-generated targets. We need to create
# check-lldb-shell manually.
add_lit_testsuite(check-lldb-shell "Running lldb shell test suite"
${CMAKE_CURRENT_BINARY_DIR}
DEPENDS lldb-test-deps)
endif()

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

@ -1,17 +1,7 @@
add_custom_target(lldb-unit-test-deps)
add_dependencies(lldb-unit-test-deps lldb-test-deps)
add_lit_testsuites(LLDB-UNIT
${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS lldb-unit-test-deps)
# Configure the Unit test suite.
configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py
MAIN_CONFIG
${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py)
add_lit_testsuite(check-lldb-unit "Running lldb unit test suite"
${CMAKE_CURRENT_BINARY_DIR}
EXCLUDE_FROM_CHECK_ALL
DEPENDS lldb-unit-test-deps)

3
lldb/unittests/CMakeLists.txt
View File

@ -1,7 +1,6 @@
add_custom_target(LLDBUnitTests)
set_target_properties(LLDBUnitTests PROPERTIES FOLDER "lldb tests")
add_dependencies(lldb-unit-test-deps LLDBUnitTests)
add_dependencies(lldb-test-deps LLDBUnitTests)
include_directories(${LLDB_SOURCE_ROOT})
include_directories(${LLDB_PROJECT_ROOT}/unittests)