From a49bc5c9e512fb2bbc5b96c44042a5e330d2116d Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 17 Nov 2024 00:31:51 +0200 Subject: [PATCH] meson.setupHook: Add timeout-multiplier 0 ss infinite, nix will take care of the timeout In loaded environments the tests can take longer to build (cherry picked from commit 54522e10d558fa88e032d24b426ec788d34a70ec) --- pkgs/by-name/me/meson/setup-hook.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/me/meson/setup-hook.sh b/pkgs/by-name/me/meson/setup-hook.sh index a88a276f09a8..b2061a12058c 100644 --- a/pkgs/by-name/me/meson/setup-hook.sh +++ b/pkgs/by-name/me/meson/setup-hook.sh @@ -54,6 +54,10 @@ mesonCheckPhase() { local flagsArray=() concatTo flagsArray mesonCheckFlags mesonCheckFlagsArray + if [ -z "${dontAddTimeoutMultiplier:-}" ]; then + flagsArray+=("--timeout-multiplier=0") + fi + echoCmd 'mesonCheckPhase flags' "${flagsArray[@]}" meson test --no-rebuild --print-errorlogs "${flagsArray[@]}"