~ruther/guix-local: tests: Pass ‘--timeout’ for builds with the host store.

4 files changed, 9 insertions(+), 5 deletions(-)

M tests/guix-environment-container.sh
M tests/guix-home.sh
M tests/guix-pack-localstatedir.sh
M tests/guix-pack-relocatable.sh

M tests/guix-environment-container.sh => tests/guix-environment-container.sh +2 -1

@@ 230,7 230,8 @@ storedir="`guile -c '(use-modules (guix config))(display %storedir)'`"
 localstatedir="`guile -c '(use-modules (guix config))(display %localstatedir)'`"
 NIX_STORE_DIR="$storedir"
 GUIX_DAEMON_SOCKET="$localstatedir/guix/daemon-socket/socket"
-export NIX_STORE_DIR GUIX_DAEMON_SOCKET
+GUIX_BUILD_OPTIONS="--timeout=180" # set an upper limit
+export NIX_STORE_DIR GUIX_DAEMON_SOCKET GUIX_BUILD_OPTIONS
 
 if ! guile -c '(use-modules (guix)) (exit (false-if-exception (open-connection)))'
 then

M tests/guix-home.sh => tests/guix-home.sh +2 -1

@@ 39,7 39,8 @@ container_supported ()
 localstatedir="$(guile -c '(use-modules (guix config))(display %localstatedir)')"
 NIX_STORE_DIR="$(guile -c '(use-modules (guix config))(display %storedir)')"
 GUIX_DAEMON_SOCKET="$localstatedir/guix/daemon-socket/socket"
-export NIX_STORE_DIR GUIX_DAEMON_SOCKET
+GUIX_BUILD_OPTIONS="--timeout=180" # set an upper limit
+export NIX_STORE_DIR GUIX_DAEMON_SOCKET GUIX_BUILD_OPTIONS
 
 # Run tests only when a "real" daemon is available.
 if ! guile -c '(use-modules (guix)) (exit (false-if-exception (open-connection)))'

M tests/guix-pack-localstatedir.sh => tests/guix-pack-localstatedir.sh +2 -1

@@ 31,7 31,8 @@ storedir="`guile -c '(use-modules (guix config))(display %storedir)'`"
 localstatedir="`guile -c '(use-modules (guix config))(display %localstatedir)'`"
 NIX_STORE_DIR="$storedir"
 GUIX_DAEMON_SOCKET="$localstatedir/guix/daemon-socket/socket"
-export NIX_STORE_DIR GUIX_DAEMON_SOCKET
+GUIX_BUILD_OPTIONS="--timeout=180" # set an upper limit
+export NIX_STORE_DIR GUIX_DAEMON_SOCKET GUIX_BUILD_OPTIONS
 
 if ! guile -c '(use-modules (guix)) (exit (false-if-exception (open-connection)))'
 then

M tests/guix-pack-relocatable.sh => tests/guix-pack-relocatable.sh +3 -2

@@ 1,5 1,5 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2018, 2019, 2020, 2023 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2018-2020, 2023, 2025 Ludovic Courtès <ludo@gnu.org>
 # Copyright © 2020 Eric Bavier <bavier@posteo.net>
 #
 # This file is part of GNU Guix.


@@ 32,7 32,8 @@ storedir="`guile -c '(use-modules (guix config))(display %storedir)'`"
 localstatedir="`guile -c '(use-modules (guix config))(display %localstatedir)'`"
 NIX_STORE_DIR="$storedir"
 GUIX_DAEMON_SOCKET="$localstatedir/guix/daemon-socket/socket"
-export NIX_STORE_DIR GUIX_DAEMON_SOCKET
+GUIX_BUILD_OPTIONS="--timeout=180"
+export NIX_STORE_DIR GUIX_DAEMON_SOCKET GUIX_BUILD_OPTIONS
 
 if ! guile -c '(use-modules (guix)) (exit (false-if-exception (open-connection)))'
 then