https://github.com/charles-zablit updated https://github.com/llvm/llvm-project/pull/198906
>From e8b26818361ab60a894e5d3970773ffc900f9e62 Mon Sep 17 00:00:00 2001 From: Charles Zablit <[email protected]> Date: Wed, 20 May 2026 22:23:39 +0100 Subject: [PATCH 1/3] [lldb][windows] enable CI tests --- .ci/compute_projects.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.ci/compute_projects.py b/.ci/compute_projects.py index 97caec7ad947d..496fad5f5ed70 100644 --- a/.ci/compute_projects.py +++ b/.ci/compute_projects.py @@ -201,12 +201,7 @@ # where a project can be built but its tests are not yet stable on that # platform, so we still want a compile-time signal. PROJECT_CHECK_TARGETS_OVERRIDE = { - "Windows": { - # TODO(issues/132800): LLDB tests need environment setup on Windows. - # In the meantime, at least compile lldb and lldb-dap to catch - # breakage. - "lldb": "lldb lldb-dap", - }, + "Windows": {}, } >From 724f518105bb9384fd36213bb72f36c86f3f4614 Mon Sep 17 00:00:00 2001 From: Charles Zablit <[email protected]> Date: Fri, 29 May 2026 15:57:42 +0100 Subject: [PATCH 2/3] fixup! [lldb][windows] enable CI tests --- .ci/compute_projects.py | 17 +++-------------- .ci/compute_projects_test.py | 24 +++++++----------------- 2 files changed, 10 insertions(+), 31 deletions(-) diff --git a/.ci/compute_projects.py b/.ci/compute_projects.py index 496fad5f5ed70..ff69479fff711 100644 --- a/.ci/compute_projects.py +++ b/.ci/compute_projects.py @@ -123,6 +123,8 @@ # enabled on changes to dependencies. EXCLUDE_DEPENDENTS_WINDOWS = { "flang", + # TODO: Re-enable once Windows CI timings allow it (daemonized testing). + "lldb", } EXCLUDE_MAC = { @@ -195,16 +197,6 @@ # Projects that should not run any tests. These need to be metaprojects. SKIP_PROJECTS = ["docs", "gn"] -# Overrides for PROJECT_CHECK_TARGETS on a per-platform basis. If a platform -# has an entry for a given project here, its value is used as the ninja -# target(s) instead of the default check target. This is intended for cases -# where a project can be built but its tests are not yet stable on that -# platform, so we still want a compile-time signal. -PROJECT_CHECK_TARGETS_OVERRIDE = { - "Windows": {}, -} - - def _add_dependencies(projects: Set[str], runtimes: Set[str]) -> Set[str]: projects_with_dependents = set(projects) current_projects_count = 0 @@ -262,11 +254,8 @@ def _compute_project_check_targets( projects_to_test: Set[str], platform: str ) -> Set[str]: check_targets = set() - platform_overrides = PROJECT_CHECK_TARGETS_OVERRIDE.get(platform, {}) for project_to_test in projects_to_test: - if project_to_test in platform_overrides: - check_targets.add(platform_overrides[project_to_test]) - elif project_to_test in PROJECT_CHECK_TARGETS: + if project_to_test in PROJECT_CHECK_TARGETS: check_targets.add(PROJECT_CHECK_TARGETS[project_to_test]) return check_targets diff --git a/.ci/compute_projects_test.py b/.ci/compute_projects_test.py index 394ded6d563f0..0df0dc09d62fc 100644 --- a/.ci/compute_projects_test.py +++ b/.ci/compute_projects_test.py @@ -39,11 +39,11 @@ def test_llvm_windows(self): ) self.assertEqual( env_variables["projects_to_build"], - "clang;clang-tools-extra;lld;lldb;llvm;mlir;polly", + "clang;clang-tools-extra;lld;llvm;mlir;polly", ) self.assertEqual( env_variables["project_check_targets"], - "check-clang check-clang-tools check-lld check-llvm check-mlir check-polly lldb lldb-dap", + "check-clang check-clang-tools check-lld check-llvm check-mlir check-polly", ) self.assertEqual(env_variables["runtimes_to_build"], "") self.assertEqual( @@ -112,11 +112,11 @@ def test_clang_windows(self): ) self.assertEqual( env_variables["projects_to_build"], - "clang;clang-tools-extra;lld;lldb;llvm", + "clang;clang-tools-extra;lld;llvm", ) self.assertEqual( env_variables["project_check_targets"], - "check-clang check-clang-tools lldb lldb-dap", + "check-clang check-clang-tools", ) self.assertEqual(env_variables["runtimes_to_build"], "compiler-rt") self.assertEqual( @@ -191,16 +191,6 @@ def test_bolt(self): self.assertEqual(env_variables["runtimes_check_targets"], "") self.assertEqual(env_variables["runtimes_check_targets_needs_reconfig"], "") - def test_lldb(self): - env_variables = compute_projects.get_env_variables( - ["lldb/CMakeLists.txt"], "Linux" - ) - self.assertEqual(env_variables["projects_to_build"], "clang;lldb;llvm") - self.assertEqual(env_variables["project_check_targets"], "check-lldb") - self.assertEqual(env_variables["runtimes_to_build"], "") - self.assertEqual(env_variables["runtimes_check_targets"], "") - self.assertEqual(env_variables["runtimes_check_targets_needs_reconfig"], "") - def test_mlir(self): env_variables = compute_projects.get_env_variables( ["mlir/CMakeLists.txt"], "Linux" @@ -327,11 +317,11 @@ def test_windows_ci(self): ) self.assertEqual( env_variables["projects_to_build"], - "clang;clang-tools-extra;lld;lldb;llvm;mlir;polly", + "clang;clang-tools-extra;lld;llvm;mlir;polly", ) self.assertEqual( env_variables["project_check_targets"], - "check-clang check-clang-cir check-clang-tools check-lld check-llvm check-mlir check-polly lldb lldb-dap", + "check-clang check-clang-cir check-clang-tools check-lld check-llvm check-mlir check-polly", ) self.assertEqual( env_variables["runtimes_to_build"], @@ -472,7 +462,7 @@ def test_lldb_windows(self): ["lldb/CMakeLists.txt"], "Windows" ) self.assertEqual(env_variables["projects_to_build"], "clang;lld;lldb;llvm") - self.assertEqual(env_variables["project_check_targets"], "lldb lldb-dap") + self.assertEqual(env_variables["project_check_targets"], "check-lldb") self.assertEqual(env_variables["runtimes_to_build"], "compiler-rt") self.assertEqual(env_variables["runtimes_check_targets"], "") self.assertEqual(env_variables["runtimes_check_targets_needs_reconfig"], "") >From 3bc100c8015f7a570e8ddf9bed3209f2a8f3c2cf Mon Sep 17 00:00:00 2001 From: Charles Zablit <[email protected]> Date: Mon, 1 Jun 2026 15:57:51 +0100 Subject: [PATCH 3/3] skip TestDAP_restart_console --- .../API/tools/lldb-dap/restart/TestDAP_restart_console.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lldb/test/API/tools/lldb-dap/restart/TestDAP_restart_console.py b/lldb/test/API/tools/lldb-dap/restart/TestDAP_restart_console.py index c80a3cdc10d95..e10d6791eeaf2 100644 --- a/lldb/test/API/tools/lldb-dap/restart/TestDAP_restart_console.py +++ b/lldb/test/API/tools/lldb-dap/restart/TestDAP_restart_console.py @@ -12,7 +12,7 @@ @skipIfBuildType(["debug"]) class TestDAP_restart_console(lldbdap_testcase.DAPTestCaseBase): @skipIfAsan - @expectedFailureWindows + @skipIfWindows # https://github.com/llvm/llvm-project/issues/200840 @skipIf(oslist=["linux"], archs=["arm$"]) # Always times out on buildbot def test_basic_functionality(self): """ @@ -61,7 +61,7 @@ def test_basic_functionality(self): self.continue_to_exit() @skipIfAsan - @expectedFailureWindows + @skipIfWindows # https://github.com/llvm/llvm-project/issues/200840 @skipIf(oslist=["linux"], archs=["arm$"]) # Always times out on buildbot def test_stopOnEntry(self): """ _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
