diff options
| author | Michel Dänzer <mdaenzer@redhat.com> | 2023-01-19 10:25:57 +0100 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2023-01-19 15:07:57 +0100 |
| commit | b2dee689faf6e174961259fb5561fe4996141510 (patch) | |
| tree | 6cf2d1c143773f5d9222f02e3ac552437d9c3211 | |
| parent | 3a02f56b4336c5220a67b297e5d90e3a709893db (diff) | |
| download | xserver-b2dee689faf6e174961259fb5561fe4996141510.tar.gz | |
ci: Use "meson test" instead of "ninja test"
This lets us actually limit the number of test processes spawned in
parallel.
(ninja test runs meson test without --num-processes, so it ends up
spawning as many processes in parallel as there are CPU cores)
| -rwxr-xr-x | .gitlab-ci/build-and-test.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab-ci/build-and-test.sh b/.gitlab-ci/build-and-test.sh index 6631f9371..534aa422f 100755 --- a/.gitlab-ci/build-and-test.sh +++ b/.gitlab-ci/build-and-test.sh @@ -25,7 +25,8 @@ meson -Dc_args="-fno-common" -Dprefix=/usr -Dxephyr=true -Dwerror=true $MESON_EX ninja -j${FDO_CI_CONCURRENT:-4} -C build/ dist export PIGLIT_DIR=/root/piglit XTEST_DIR=/root/xts -ninja -j${FDO_CI_CONCURRENT:-4} -C build/ test +ninja -j${FDO_CI_CONCURRENT:-4} -C build/ +meson test --num-processes ${FDO_CI_CONCURRENT:-4} --print-errorlogs -C build/ check_piglit_results xephyr-glamor hw/kdrive/ephyr/Xephyr.p/ephyr_glamor.c.o check_piglit_results xvfb hw/vfb/Xvfb |