[Lldb-commits] [lldb] e76b866 - Revert "[lldb] Make the API, Shell and Unit tests independent lit test suites"
Jonas Devlieghere via lldb-commits
lldb-commits at lists.llvm.org
Fri Mar 19 17:57:32 PDT 2021
Author: Jonas Devlieghere
Date: 2021-03-19T17:57:26-07:00
New Revision: e76b86642f51c868c307d097cb129df1b1ac6423
URL: https://github.com/llvm/llvm-project/commit/e76b86642f51c868c307d097cb129df1b1ac6423
DIFF: https://github.com/llvm/llvm-project/commit/e76b86642f51c868c307d097cb129df1b1ac6423.diff
LOG: Revert "[lldb] Make the API, Shell and Unit tests independent lit test suites"
This reverts commit 6c52d4fd4c24a0cf738e44516ca8378d65dcf019.
Added:
Modified:
lldb/test/API/CMakeLists.txt
lldb/test/API/lit.cfg.py
lldb/test/API/lit.site.cfg.py.in
lldb/test/CMakeLists.txt
lldb/test/Shell/CMakeLists.txt
lldb/test/Unit/CMakeLists.txt
lldb/unittests/CMakeLists.txt
Removed:
################################################################################
diff --git a/lldb/test/API/CMakeLists.txt b/lldb/test/API/CMakeLists.txt
index 2b7dba456b1a..0dbc46defc81 100644
--- a/lldb/test/API/CMakeLists.txt
+++ b/lldb/test/API/CMakeLists.txt
@@ -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
diff erent 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)
diff --git a/lldb/test/API/lit.cfg.py b/lldb/test/API/lit.cfg.py
index 1bd7dc35fb2a..54a02453b174 100644
--- a/lldb/test/API/lit.cfg.py
+++ b/lldb/test/API/lit.cfg.py
@@ -17,10 +17,9 @@
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):
diff --git a/lldb/test/API/lit.site.cfg.py.in b/lldb/test/API/lit.site.cfg.py.in
index 49ea94aacd11..2e368325a9f0 100644
--- a/lldb/test/API/lit.site.cfg.py.in
+++ b/lldb/test/API/lit.site.cfg.py.in
@@ -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@"
diff --git a/lldb/test/CMakeLists.txt b/lldb/test/CMakeLists.txt
index c6b01c66a0ef..8363bde23035 100644
--- a/lldb/test/CMakeLists.txt
+++ b/lldb/test/CMakeLists.txt
@@ -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.
diff --git a/lldb/test/Shell/CMakeLists.txt b/lldb/test/Shell/CMakeLists.txt
index f0d7b9a34651..d203f1e093c7 100644
--- a/lldb/test/Shell/CMakeLists.txt
+++ b/lldb/test/Shell/CMakeLists.txt
@@ -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()
diff --git a/lldb/test/Unit/CMakeLists.txt b/lldb/test/Unit/CMakeLists.txt
index 3233c0873c1f..e9b3d9e35d74 100644
--- a/lldb/test/Unit/CMakeLists.txt
+++ b/lldb/test/Unit/CMakeLists.txt
@@ -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)
diff --git a/lldb/unittests/CMakeLists.txt b/lldb/unittests/CMakeLists.txt
index e7b0f1c17d6d..37a5f972cdec 100644
--- a/lldb/unittests/CMakeLists.txt
+++ b/lldb/unittests/CMakeLists.txt
@@ -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)
More information about the lldb-commits
mailing list