c4patino/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-06 17:13:24 -05:00
Code Issues Projects Releases Packages Wiki Activity

meson.setupHook: fix enableParallelChecking

Browse source 
Previously, this controlled the parallelism of building the tests.
The tests were then always run in parallel.  Fix so
enableParallelBuilding controls building, and enableParallelChecking
controls the test run.

Fixes: bb73d9a0ce ("meson: support enableParallelChecking")
This commit is contained in:
Alyssa Ross 2026-03-19 09:10:11 +01:00
commit f33cf3c09e
No known key found for this signature in database
GPG key ID: 9975DC24B77D6915
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pkgs/by-name/me/meson/setup-hook.sh
View file

@ -63,16 +63,22 @@ mesonCheckPhase() {
flagsArray+=("--timeout-multiplier=0")
fi
# Parallel checking is enabled by default.
# Parallel building is enabled by default.
local buildCores=1
if [ "${enableParallelChecking-1}" ]; then
if [ "${enableParallelBuilding-1}" ]; then
buildCores="$NIX_BUILD_CORES"
fi
TERM=dumb ninja -j"$buildCores" $ninjaFlags "${ninjaFlagsArray[@]}" meson-test-prereq
# Parallel checking is enabled by default.
local testCores=1
if [ "${enableParallelChecking-1}" ]; then
testCores="$NIX_BUILD_CORES"
fi
echoCmd 'mesonCheckPhase flags' "${flagsArray[@]}"
meson test --no-rebuild --print-errorlogs --max-lines=1000000 "${flagsArray[@]}"
meson test -j"$testCores" --no-rebuild --print-errorlogs --max-lines=1000000 "${flagsArray[@]}"
runHook postCheck
}