From 8f7eee565fd540a00e9fbd931e29c0cadd7ceb02 Mon Sep 17 00:00:00 2001 From: Daniel Chen Date: Thu, 10 Apr 2025 16:08:12 -0400 Subject: [PATCH 1/2] Update test_flang in CI to use flang-rt as one of the projects. --- .ci/compute_projects.py | 3 +++ .ci/compute_projects_test.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.ci/compute_projects.py b/.ci/compute_projects.py index ff43547c9bbe5..89a7c787e5c7e 100644 --- a/.ci/compute_projects.py +++ b/.ci/compute_projects.py @@ -25,6 +25,7 @@ "libc": {"clang", "lld"}, "openmp": {"clang", "lld"}, "flang": {"llvm", "clang"}, + "flang-rt": {"flang"}, "lldb": {"llvm", "clang"}, "libclc": {"llvm", "clang"}, "lld": {"llvm"}, @@ -51,6 +52,7 @@ # TODO(issues/132795): LLDB should be enabled on clang changes. "clang": {"clang-tools-extra", "compiler-rt", "cross-project-tests"}, "clang-tools-extra": {"libc"}, + "flang": {"flang-rt"}, "mlir": {"flang"}, } @@ -104,6 +106,7 @@ "bolt": "check-bolt", "lld": "check-lld", "flang": "check-flang", + "flang-rt": "check-flang", "libc": "check-libc", "lld": "check-lld", "lldb": "check-lldb", diff --git a/.ci/compute_projects_test.py b/.ci/compute_projects_test.py index e787fd8133c86..d532c79f37a2c 100644 --- a/.ci/compute_projects_test.py +++ b/.ci/compute_projects_test.py @@ -140,7 +140,7 @@ def test_flang(self): env_variables = compute_projects.get_env_variables( ["flang/CMakeLists.txt"], "Linux" ) - self.assertEqual(env_variables["projects_to_build"], "clang;flang;llvm") + self.assertEqual(env_variables["projects_to_build"], "clang;flang;llvm;flang-rt") self.assertEqual(env_variables["project_check_targets"], "check-flang") self.assertEqual(env_variables["runtimes_to_build"], "") self.assertEqual(env_variables["runtimes_check_targets"], "") From 8046c39b4c8db0010194589d4e1460b8ebf61095 Mon Sep 17 00:00:00 2001 From: Daniel Chen Date: Thu, 10 Apr 2025 17:09:33 -0400 Subject: [PATCH 2/2] To fix format. --- .ci/compute_projects_test.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.ci/compute_projects_test.py b/.ci/compute_projects_test.py index d532c79f37a2c..73f912e782b4a 100644 --- a/.ci/compute_projects_test.py +++ b/.ci/compute_projects_test.py @@ -140,7 +140,9 @@ def test_flang(self): env_variables = compute_projects.get_env_variables( ["flang/CMakeLists.txt"], "Linux" ) - self.assertEqual(env_variables["projects_to_build"], "clang;flang;llvm;flang-rt") + self.assertEqual( + env_variables["projects_to_build"], "clang;flang;llvm;flang-rt" + ) self.assertEqual(env_variables["project_check_targets"], "check-flang") self.assertEqual(env_variables["runtimes_to_build"], "") self.assertEqual(env_variables["runtimes_check_targets"], "")