Skip to content

Commit bd38ed5

Browse files
pks-tgitster
authored andcommitted
ci: fix aggregation of test results with Meson
Our CI needs to be aware of the location of the test output directory so that it knows where to find test results. Some of our CI jobs achieve this by setting the `TEST_OUTPUT_DIRECTORY` environment variable, which ensures that the output will be written to that directory. Other jobs, especially on GitHub Workflows, don't set that environment variable and instead expect test results to be located in the source directory in "t/". The latter logic does not work with Meson though, as the test results are not written into the source directory by default, but instead into the build directory. As such, any job that uses Meson without setting the environment variable will be unable to locate and aggregate results. Fix this by explicitly setting the test output directory when we set up the Meson build directory. Like this, we can easily default to "t/" in the source directory when the value hasn't been set explicitly. Reported-by: Johannes Schindelin <[email protected]> Signed-off-by: Patrick Steinhardt <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d50a5e8 commit bd38ed5

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

ci/run-build-and-tests.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ case "$jobname" in
5757
--warnlevel 2 --werror \
5858
--wrap-mode nofallback \
5959
-Dfuzzers=true \
60+
-Dtest_output_directory="${TEST_OUTPUT_DIRECTORY:-$(pwd)/t}" \
6061
$MESONFLAGS
6162
group "Build" meson compile -C build --
6263
if test -n "$run_tests"

0 commit comments

Comments
 (0)