mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
meson.setupHook: fix enableParallelChecking (#518969)
This commit is contained in:
commit
f58e9393ed
1 changed files with 9 additions and 3 deletions
|
|
@ -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
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue