Skip to content

Commit 4a675f8

Browse files
committed
Fix premerge script so that projects appear in LLVM_ENABLE_RUNTIMES correctly
1 parent 3782eb6 commit 4a675f8

File tree

3 files changed

+27
-12
lines changed

3 files changed

+27
-12
lines changed

.ci/compute_projects.py

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,16 @@
5353
"mlir": {"flang"},
5454
# Test everything if ci scripts are changed.
5555
".ci": {
56-
"llvm",
57-
"clang",
58-
"lld",
59-
"lldb",
60-
"bolt",
61-
"clang-tools-extra",
62-
"mlir",
63-
"polly",
64-
"flang",
65-
"libclc",
56+
# "llvm",
57+
# "clang",
58+
# "lld",
59+
# "lldb",
60+
# "bolt",
61+
# "clang-tools-extra",
62+
# "mlir",
63+
# "polly",
64+
# "flang",
65+
# "libclc",
6666
"openmp",
6767
},
6868
}
@@ -77,12 +77,12 @@
7777
DEPENDENT_RUNTIMES_TO_TEST = {
7878
"clang": {"compiler-rt"},
7979
"clang-tools-extra": {"libc"},
80-
".ci": {"compiler-rt", "libc"},
80+
# ".ci": {"compiler-rt", "libc"},
8181
}
8282
DEPENDENT_RUNTIMES_TO_TEST_NEEDS_RECONFIG = {
8383
"llvm": {"libcxx", "libcxxabi", "libunwind"},
8484
"clang": {"libcxx", "libcxxabi", "libunwind"},
85-
".ci": {"libcxx", "libcxxabi", "libunwind"},
85+
# ".ci": {"libcxx", "libcxxabi", "libunwind"},
8686
}
8787

8888
EXCLUDE_LINUX = {
@@ -170,6 +170,7 @@ def _exclude_projects(current_projects: Set[str], platform: str) -> Set[str]:
170170
def _compute_projects_to_test(modified_projects: Set[str], platform: str) -> Set[str]:
171171
projects_to_test = set()
172172
for modified_project in modified_projects:
173+
sys.stderr.write("HELLO " + modified_project)
173174
if modified_project in RUNTIMES:
174175
continue
175176
# Skip all projects where we cannot run tests.
@@ -207,6 +208,8 @@ def _compute_runtimes_to_test(modified_projects: Set[str], platform: str) -> Set
207208
for modified_project in modified_projects:
208209
if modified_project in DEPENDENT_RUNTIMES_TO_TEST:
209210
runtimes_to_test.update(DEPENDENT_RUNTIMES_TO_TEST[modified_project])
211+
# if modified_project in RUNTIMES:
212+
# runtimes_to_test.add(modified_project)
210213
return _exclude_projects(runtimes_to_test, platform)
211214

212215

.ci/compute_projects_test.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,16 @@ def test_exclude_runtiems_in_projects(self):
197197
self.assertEqual(env_variables["runtimes_check_targets"], "")
198198
self.assertEqual(env_variables["runtimes_check_targets_needs_reconfig"], "")
199199

200+
def test_exclude_libc_from_projects(self):
201+
env_variables = compute_projects.get_env_variables(
202+
["libc/CMakeLists.txt"], "Linux"
203+
)
204+
self.assertEqual(env_variables["projects_to_build"], "")
205+
self.assertEqual(env_variables["project_check_targets"], "")
206+
self.assertEqual(env_variables["runtimes_to_build"], "libc")
207+
self.assertEqual(env_variables["runtimes_check_targets"], "check-libc")
208+
self.assertEqual(env_variables["runtimes_check_targets_needs_reconfig"], "")
209+
200210
def test_exclude_docs(self):
201211
env_variables = compute_projects.get_env_variables(
202212
["llvm/docs/CIBestPractices.rst"], "Linux"

libc/src/math/exp10f.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
#include "src/__support/macros/config.h"
1313

14+
// test change to trigger premerge
15+
1416
namespace LIBC_NAMESPACE_DECL {
1517

1618
float exp10f(float x);

0 commit comments

Comments
 (0)