From 8b5ed211d5d3cea845b41fdff4b8dfcb183ee921 Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Thu, 26 Jun 2025 10:38:01 +0200 Subject: [PATCH] .gitlab-ci: Use meson instead of ninja for running the tests Using ninja spawns a very high number of concurrent tests (even with the option '-j'). The CI runs two Xservers, one Xephyr instance running inside an Xvfb instance. As a result, running the tests may exhaust the CI server resources and eventually the CI fails. meson, however, doesn't seem to suffer the same issue, and the number of Xserver spawned for the CI tests remains limited. The master branch already uses meson (after commit ce2f24c51 which uses a meson-build script instead). Switch to meson instead of ninja for running the tests. Signed-off-by: Olivier Fourdan Part-of: --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d5404c00a..60a57c554 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -75,7 +75,7 @@ meson: script: - meson -Dc_args="-fno-common" -Dprefix=/usr -Dxephyr=true -Dwerror=true $MESON_EXTRA_OPTIONS build/ - ninja -j${FDO_CI_CONCURRENT:-4} -C build/ dist - - PIGLIT_DIR=/root/piglit XTEST_DIR=/root/xts ninja -j${FDO_CI_CONCURRENT:-4} -C build/ test + - PIGLIT_DIR=/root/piglit XTEST_DIR=/root/xts meson test --num-processes ${FDO_CI_CONCURRENT:-4} -C build/ - .gitlab-ci/manpages-check meson-noglamor: