From b2dee689faf6e174961259fb5561fe4996141510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Thu, 19 Jan 2023 10:25:57 +0100 Subject: [PATCH] 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) --- .gitlab-ci/build-and-test.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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