<div dir="ltr">Would be great if you could include some detail in the commit message (or, in this case, in a follow-up reply) about why the patch was reverted, thanks!</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, Mar 19, 2021 at 5:57 PM Jonas Devlieghere via lldb-commits <<a href="mailto:lldb-commits@lists.llvm.org">lldb-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><br>
Author: Jonas Devlieghere<br>
Date: 2021-03-19T17:57:26-07:00<br>
New Revision: e76b86642f51c868c307d097cb129df1b1ac6423<br>
<br>
URL: <a href="https://github.com/llvm/llvm-project/commit/e76b86642f51c868c307d097cb129df1b1ac6423" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/e76b86642f51c868c307d097cb129df1b1ac6423</a><br>
DIFF: <a href="https://github.com/llvm/llvm-project/commit/e76b86642f51c868c307d097cb129df1b1ac6423.diff" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/e76b86642f51c868c307d097cb129df1b1ac6423.diff</a><br>
<br>
LOG: Revert "[lldb] Make the API, Shell and Unit tests independent lit test suites"<br>
<br>
This reverts commit 6c52d4fd4c24a0cf738e44516ca8378d65dcf019.<br>
<br>
Added: <br>
<br>
<br>
Modified: <br>
    lldb/test/API/CMakeLists.txt<br>
    lldb/test/API/<a href="http://lit.cfg.py" rel="noreferrer" target="_blank">lit.cfg.py</a><br>
    lldb/test/API/<a href="http://lit.site.cfg.py.in" rel="noreferrer" target="_blank">lit.site.cfg.py.in</a><br>
    lldb/test/CMakeLists.txt<br>
    lldb/test/Shell/CMakeLists.txt<br>
    lldb/test/Unit/CMakeLists.txt<br>
    lldb/unittests/CMakeLists.txt<br>
<br>
Removed: <br>
<br>
<br>
<br>
################################################################################<br>
diff  --git a/lldb/test/API/CMakeLists.txt b/lldb/test/API/CMakeLists.txt<br>
index 2b7dba456b1a..0dbc46defc81 100644<br>
--- a/lldb/test/API/CMakeLists.txt<br>
+++ b/lldb/test/API/CMakeLists.txt<br>
@@ -1,10 +1,3 @@<br>
-add_custom_target(lldb-api-test-deps)<br>
-add_dependencies(lldb-api-test-deps lldb-test-deps)<br>
-<br>
-add_lit_testsuites(LLDB-API<br>
-  ${CMAKE_CURRENT_SOURCE_DIR}<br>
-  DEPENDS lldb-api-test-deps)<br>
-<br>
 function(add_python_test_target name test_script args comment)<br>
   set(PYTHON_TEST_COMMAND<br>
     ${Python3_EXECUTABLE}<br>
@@ -160,35 +153,39 @@ string(REPLACE ${CMAKE_CFG_INTDIR} ${dotest_args_replacement} LLDB_TEST_EXECUTAB<br>
 string(REPLACE ${CMAKE_CFG_INTDIR} ${dotest_args_replacement} LLDB_TEST_COMPILER "${LLDB_TEST_COMPILER}")<br>
 string(REPLACE ${CMAKE_CFG_INTDIR} ${dotest_args_replacement} LLDB_TEST_DSYMUTIL "${LLDB_TEST_DSYMUTIL}")<br>
<br>
+# Configure the API test suite.<br>
 configure_lit_site_cfg(<br>
   ${CMAKE_CURRENT_SOURCE_DIR}/<a href="http://lit.site.cfg.py.in" rel="noreferrer" target="_blank">lit.site.cfg.py.in</a><br>
   ${CMAKE_CURRENT_BINARY_DIR}/<a href="http://lit.site.cfg.py" rel="noreferrer" target="_blank">lit.site.cfg.py</a><br>
   MAIN_CONFIG<br>
   ${CMAKE_CURRENT_SOURCE_DIR}/<a href="http://lit.cfg.py" rel="noreferrer" target="_blank">lit.cfg.py</a>)<br>
<br>
+if (CMAKE_GENERATOR STREQUAL "Xcode")<br>
+  # Xcode does not get the auto-generated targets. We need to create<br>
+  # check-lldb-api manually.<br>
+  add_lit_testsuite(check-lldb-api "Running lldb api test suite"<br>
+    ${CMAKE_CURRENT_BINARY_DIR}<br>
+    DEPENDS lldb-test-deps)<br>
+endif()<br>
+<br>
 # Targets for running the test suite on the <br>
diff erent Apple simulators.<br>
 add_lit_testsuite(check-lldb-simulator-ios<br>
   "Running lldb test suite on the iOS simulator"<br>
   ${CMAKE_CURRENT_BINARY_DIR}<br>
   PARAMS "lldb-run-with-simulator=ios"<br>
   EXCLUDE_FROM_CHECK_ALL<br>
-  DEPENDS lldb-api-test-deps)<br>
+  DEPENDS lldb-test-deps)<br>
<br>
 add_lit_testsuite(check-lldb-simulator-watchos<br>
   "Running lldb test suite on the watchOS simulator"<br>
   ${CMAKE_CURRENT_BINARY_DIR}<br>
   PARAMS "lldb-run-with-simulator=watchos"<br>
   EXCLUDE_FROM_CHECK_ALL<br>
-  DEPENDS lldb-api-test-deps)<br>
+  DEPENDS lldb-test-deps)<br>
<br>
 add_lit_testsuite(check-lldb-simulator-tvos<br>
   "Running lldb test suite on the tvOS simulator"<br>
   ${CMAKE_CURRENT_BINARY_DIR}<br>
   PARAMS "lldb-run-with-simulator=tvos"<br>
   EXCLUDE_FROM_CHECK_ALL<br>
-  DEPENDS lldb-api-test-deps)<br>
-<br>
-add_lit_testsuite(check-lldb-api "Running lldb api test suite"<br>
-  ${CMAKE_CURRENT_BINARY_DIR}<br>
-  EXCLUDE_FROM_CHECK_ALL<br>
-  DEPENDS lldb-api-test-deps)<br>
+  DEPENDS lldb-test-deps)<br>
<br>
diff  --git a/lldb/test/API/<a href="http://lit.cfg.py" rel="noreferrer" target="_blank">lit.cfg.py</a> b/lldb/test/API/<a href="http://lit.cfg.py" rel="noreferrer" target="_blank">lit.cfg.py</a><br>
index 1bd7dc35fb2a..54a02453b174 100644<br>
--- a/lldb/test/API/<a href="http://lit.cfg.py" rel="noreferrer" target="_blank">lit.cfg.py</a><br>
+++ b/lldb/test/API/<a href="http://lit.cfg.py" rel="noreferrer" target="_blank">lit.cfg.py</a><br>
@@ -17,10 +17,9 @@<br>
 config.suffixes = ['.py']<br>
<br>
 # test_source_root: The root path where tests are located.<br>
-config.test_source_root = os.path.dirname(__file__)<br>
-<br>
 # test_exec_root: The root path where tests should be run.<br>
-config.test_exec_root = os.path.join(config.lldb_obj_root, 'test')<br>
+config.test_source_root = os.path.dirname(__file__)<br>
+config.test_exec_root = config.test_source_root<br>
<br>
<br>
 def mkdir_p(path):<br>
<br>
diff  --git a/lldb/test/API/<a href="http://lit.site.cfg.py.in" rel="noreferrer" target="_blank">lit.site.cfg.py.in</a> b/lldb/test/API/<a href="http://lit.site.cfg.py.in" rel="noreferrer" target="_blank">lit.site.cfg.py.in</a><br>
index 49ea94aacd11..2e368325a9f0 100644<br>
--- a/lldb/test/API/<a href="http://lit.site.cfg.py.in" rel="noreferrer" target="_blank">lit.site.cfg.py.in</a><br>
+++ b/lldb/test/API/<a href="http://lit.site.cfg.py.in" rel="noreferrer" target="_blank">lit.site.cfg.py.in</a><br>
@@ -1,5 +1,6 @@<br>
 @LIT_SITE_CFG_IN_HEADER@<br>
<br>
+config.test_exec_root = "@LLDB_BINARY_DIR@"<br>
 config.llvm_src_root = "@LLVM_SOURCE_DIR@"<br>
 config.llvm_obj_root = "@LLVM_BINARY_DIR@"<br>
 config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"<br>
<br>
diff  --git a/lldb/test/CMakeLists.txt b/lldb/test/CMakeLists.txt<br>
index c6b01c66a0ef..8363bde23035 100644<br>
--- a/lldb/test/CMakeLists.txt<br>
+++ b/lldb/test/CMakeLists.txt<br>
@@ -185,13 +185,19 @@ configure_lit_site_cfg(<br>
   MAIN_CONFIG<br>
   ${CMAKE_CURRENT_SOURCE_DIR}/<a href="http://lit.cfg.py" rel="noreferrer" target="_blank">lit.cfg.py</a>)<br>
<br>
-add_lit_testsuite(check-lldb "Running lldb lit test suite"<br>
+add_lit_testsuites(LLDB<br>
+  ${CMAKE_CURRENT_SOURCE_DIR}<br>
+  DEPENDS lldb-test-deps)<br>
+<br>
+add_lit_testsuite(check-lldb-lit "Running lldb lit test suite"<br>
   ${CMAKE_CURRENT_BINARY_DIR}<br>
-  DEPENDS<br>
-    lldb-api-test-deps<br>
-    lldb-shell-test-deps<br>
-    lldb-unit-test-deps)<br>
-set_target_properties(check-lldb PROPERTIES FOLDER "lldb tests")<br>
+  DEPENDS lldb-test-deps)<br>
+set_target_properties(check-lldb-lit PROPERTIES FOLDER "lldb tests")<br>
+<br>
+add_custom_target(check-lldb)<br>
+add_dependencies(check-lldb lldb-test-deps)<br>
+set_target_properties(check-lldb PROPERTIES FOLDER "lldb misc")<br>
+add_dependencies(check-lldb check-lldb-lit)<br>
<br>
 # Add a lit test suite that runs the API & shell test while capturing a<br>
 # reproducer.<br>
<br>
diff  --git a/lldb/test/Shell/CMakeLists.txt b/lldb/test/Shell/CMakeLists.txt<br>
index f0d7b9a34651..d203f1e093c7 100644<br>
--- a/lldb/test/Shell/CMakeLists.txt<br>
+++ b/lldb/test/Shell/CMakeLists.txt<br>
@@ -1,10 +1,4 @@<br>
-add_custom_target(lldb-shell-test-deps)<br>
-add_dependencies(lldb-shell-test-deps lldb-test-deps)<br>
-<br>
-add_lit_testsuites(LLDB-SHELL<br>
-  ${CMAKE_CURRENT_SOURCE_DIR}<br>
-  DEPENDS lldb-shell-test-deps)<br>
-<br>
+# Configure the Shell test suite.<br>
 configure_lit_site_cfg(<br>
   ${CMAKE_CURRENT_SOURCE_DIR}/<a href="http://lit.site.cfg.py.in" rel="noreferrer" target="_blank">lit.site.cfg.py.in</a><br>
   ${CMAKE_CURRENT_BINARY_DIR}/<a href="http://lit.site.cfg.py" rel="noreferrer" target="_blank">lit.site.cfg.py</a><br>
@@ -14,7 +8,10 @@ configure_file(<br>
   ${CMAKE_CURRENT_SOURCE_DIR}/<a href="http://lit-lldb-init.in" rel="noreferrer" target="_blank">lit-lldb-init.in</a><br>
   ${CMAKE_CURRENT_BINARY_DIR}/lit-lldb-init)<br>
<br>
-add_lit_testsuite(check-lldb-shell "Running lldb shell test suite"<br>
-  ${CMAKE_CURRENT_BINARY_DIR}<br>
-  EXCLUDE_FROM_CHECK_ALL<br>
-  DEPENDS lldb-shell-test-deps)<br>
+if (CMAKE_GENERATOR STREQUAL "Xcode")<br>
+  # Xcode does not get the auto-generated targets. We need to create<br>
+  # check-lldb-shell manually.<br>
+  add_lit_testsuite(check-lldb-shell "Running lldb shell test suite"<br>
+    ${CMAKE_CURRENT_BINARY_DIR}<br>
+    DEPENDS lldb-test-deps)<br>
+endif()<br>
<br>
diff  --git a/lldb/test/Unit/CMakeLists.txt b/lldb/test/Unit/CMakeLists.txt<br>
index 3233c0873c1f..e9b3d9e35d74 100644<br>
--- a/lldb/test/Unit/CMakeLists.txt<br>
+++ b/lldb/test/Unit/CMakeLists.txt<br>
@@ -1,17 +1,7 @@<br>
-add_custom_target(lldb-unit-test-deps)<br>
-add_dependencies(lldb-unit-test-deps lldb-test-deps)<br>
-<br>
-add_lit_testsuites(LLDB-UNIT<br>
-  ${CMAKE_CURRENT_SOURCE_DIR}<br>
-  DEPENDS lldb-unit-test-deps)<br>
-<br>
+# Configure the Unit test suite.<br>
 configure_lit_site_cfg(<br>
   ${CMAKE_CURRENT_SOURCE_DIR}/<a href="http://lit.site.cfg.py.in" rel="noreferrer" target="_blank">lit.site.cfg.py.in</a><br>
   ${CMAKE_CURRENT_BINARY_DIR}/<a href="http://lit.site.cfg.py" rel="noreferrer" target="_blank">lit.site.cfg.py</a><br>
   MAIN_CONFIG<br>
   ${CMAKE_CURRENT_SOURCE_DIR}/<a href="http://lit.cfg.py" rel="noreferrer" target="_blank">lit.cfg.py</a>)<br>
<br>
-add_lit_testsuite(check-lldb-unit "Running lldb unit test suite"<br>
-  ${CMAKE_CURRENT_BINARY_DIR}<br>
-  EXCLUDE_FROM_CHECK_ALL<br>
-  DEPENDS lldb-unit-test-deps)<br>
<br>
diff  --git a/lldb/unittests/CMakeLists.txt b/lldb/unittests/CMakeLists.txt<br>
index e7b0f1c17d6d..37a5f972cdec 100644<br>
--- a/lldb/unittests/CMakeLists.txt<br>
+++ b/lldb/unittests/CMakeLists.txt<br>
@@ -1,7 +1,6 @@<br>
 add_custom_target(LLDBUnitTests)<br>
 set_target_properties(LLDBUnitTests PROPERTIES FOLDER "lldb tests")<br>
-<br>
-add_dependencies(lldb-unit-test-deps LLDBUnitTests)<br>
+add_dependencies(lldb-test-deps LLDBUnitTests)<br>
<br>
 include_directories(${LLDB_SOURCE_ROOT})<br>
 include_directories(${LLDB_PROJECT_ROOT}/unittests)<br>
<br>
<br>
<br>
_______________________________________________<br>
lldb-commits mailing list<br>
<a href="mailto:lldb-commits@lists.llvm.org" target="_blank">lldb-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits</a><br>
</blockquote></div>