fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-20 12:50:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

.gitlab-ci: Use meson instead of ninja for running the tests

Browse source 
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 <ofourdan@redhat.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2040>
This commit is contained in:
Olivier Fourdan 2025-06-26 10:38:01 +02:00
parent 2403cd5352
commit 8b5ed211d5
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -75,7 +75,7 @@ meson:
script: script:
- meson -Dc_args="-fno-common" -Dprefix=/usr -Dxephyr=true -Dwerror=true $MESON_EXTRA_OPTIONS build/ - meson -Dc_args="-fno-common" -Dprefix=/usr -Dxephyr=true -Dwerror=true $MESON_EXTRA_OPTIONS build/
- ninja -j${FDO_CI_CONCURRENT:-4} -C build/ dist - 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 - .gitlab-ci/manpages-check
meson-noglamor: meson-noglamor: