Skip to content

Commit 6376d55

Browse files
keith-packardnashif
authored andcommitted
llvm: Make sure tests get configured with newer meson
Attempts to run the check-llvm-toolchain stage fail with meson 1.7.99 because it doesn't appear to get the directory reconfigured with setup -Dtests=true --reconfigure. Add the "obvious" command, meson configure -Dtests=true, which is reported to fail with meson before 0.64.0. Signed-off-by: Keith Packard <keithp@keithp.com>
1 parent 75c4fd6 commit 6376d55

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

scripts/llvm/test-support/run-picolibc-tests.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,18 @@ def run_tests(meson_command, source_dir, build_dir, variant):
6666
check=True,
6767
)
6868

69+
# Newer meson doesn't apply new configuration with the above
70+
# operation, so *also* run a regular configure step
71+
subprocess.run(
72+
[
73+
meson_command,
74+
"configure",
75+
"-Dtests=true",
76+
],
77+
cwd=build_dir,
78+
check=True,
79+
)
80+
6981
returncode = subprocess.run(
7082
[meson_command, "test", "-t", "20"],
7183
cwd=build_dir,

0 commit comments

Comments
 (0)