diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba94344abc..a9aeff5b4e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,6 @@ variables: BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true" FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled -Dbuild-testsuite=true -Dintrospection=enabled" MESON_TEST_TIMEOUT_MULTIPLIER: 3 - MESON_TEST_MAX_PROCESSES: 8 FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v52" workflow: @@ -398,8 +397,6 @@ asan-build: tags: [ asan ] stage: analysis needs: [] - variables: - MESON_TEST_MAX_PROCESSES: 4 script: - export PATH="$HOME/.local/bin:$PATH" - CC=clang meson setup diff --git a/.gitlab-ci/run-tests.sh b/.gitlab-ci/run-tests.sh index dba31cd592..46e8b232c8 100755 --- a/.gitlab-ci/run-tests.sh +++ b/.gitlab-ci/run-tests.sh @@ -8,7 +8,7 @@ builddir=$1 setup=$2 suite=$3 multiplier=${MESON_TEST_TIMEOUT_MULTIPLIER:-1} -n_processes=${MESON_TEST_MAX_PROCESSES:-1} +n_processes=${MESON_TEST_MAX_PROCESSES:-$(nproc)} # Ignore memory leaks lower in dependencies export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0:detect_leaks=0:allocator_may_return_null=1:symbolize=1