From a5baf5302adfdfc3f5db50f58b3fe68eaf9ae34e Mon Sep 17 00:00:00 2001 From: Amy Huang Date: Wed, 25 Jun 2025 16:26:18 -0700 Subject: [PATCH] Add modified runtimes back to runtimes_to_{test|build} (#145805) Add libc back into the runtimes_to_test since other runtimes were removed. --- .ci/compute_projects.py | 1 + .ci/compute_projects_test.py | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.ci/compute_projects.py b/.ci/compute_projects.py index 80e4e0221b3d..c3cf714ce6c1 100644 --- a/.ci/compute_projects.py +++ b/.ci/compute_projects.py @@ -77,6 +77,7 @@ DEPENDENT_RUNTIMES_TO_BUILD = {"lldb": {"libcxx", "libcxxabi", "libunwind"}} DEPENDENT_RUNTIMES_TO_TEST = { "clang": {"compiler-rt"}, "clang-tools-extra": {"libc"}, + "libc": {"libc"}, ".ci": {"compiler-rt", "libc"}, } DEPENDENT_RUNTIMES_TO_TEST_NEEDS_RECONFIG = { diff --git a/.ci/compute_projects_test.py b/.ci/compute_projects_test.py index 5efac2636698..6299931e1ec3 100644 --- a/.ci/compute_projects_test.py +++ b/.ci/compute_projects_test.py @@ -187,7 +187,7 @@ class TestComputeProjects(unittest.TestCase): self.assertEqual(env_variables["runtimes_check_targets"], "") self.assertEqual(env_variables["runtimes_check_targets_needs_reconfig"], "") - def test_exclude_runtiems_in_projects(self): + def test_exclude_libcxx_in_projects(self): env_variables = compute_projects.get_env_variables( ["libcxx/CMakeLists.txt"], "Linux" ) @@ -197,6 +197,16 @@ class TestComputeProjects(unittest.TestCase): self.assertEqual(env_variables["runtimes_check_targets"], "") self.assertEqual(env_variables["runtimes_check_targets_needs_reconfig"], "") + def test_include_libc_in_runtimes(self): + env_variables = compute_projects.get_env_variables( + ["libc/CMakeLists.txt"], "Linux" + ) + self.assertEqual(env_variables["projects_to_build"], "clang;lld") + self.assertEqual(env_variables["project_check_targets"], "") + self.assertEqual(env_variables["runtimes_to_build"], "libc") + self.assertEqual(env_variables["runtimes_check_targets"], "check-libc") + self.assertEqual(env_variables["runtimes_check_targets_needs_reconfig"], "") + def test_exclude_docs(self): env_variables = compute_projects.get_env_variables( ["llvm/docs/CIBestPractices.rst"], "Linux"