diff --git a/.ci/compute_projects.py b/.ci/compute_projects.py index 97caec7ad947d..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,21 +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": { - # 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", - }, -} - - def _add_dependencies(projects: Set[str], runtimes: Set[str]) -> Set[str]: projects_with_dependents = set(projects) current_projects_count = 0 @@ -267,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..c00be376ad7d6 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( @@ -327,11 +327,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 +472,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"], "")