From ef6d127190fed307f1ca52883b460a7ff53b317d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 12 Feb 2022 15:26:35 +0100 Subject: tests: Set a hard build timeout. * guix/tests.scm (open-connection-for-tests): Pass #:timeout to 'set-build-options'. (call-with-external-store): Add call to 'set-build-options'. --- guix/tests.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'guix') diff --git a/guix/tests.scm b/guix/tests.scm index 06ef3cf76d..8f6d040f1f 100644 --- a/guix/tests.scm +++ b/guix/tests.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013-2021 Ludovic Courtès +;;; Copyright © 2013-2022 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -85,10 +85,12 @@ "warning: build daemon error: ~s~%" c) #f)) (let ((store (open-connection uri))) - ;; Make sure we build everything by ourselves. + ;; Make sure we build everything by ourselves. When we build something, + ;; it should take at most 5 minutes. (set-build-options store #:use-substitutes? #f - #:substitute-urls (%test-substitute-urls)) + #:substitute-urls (%test-substitute-urls) + #:timeout (* 5 60)) ;; Use the bootstrap Guile when running tests, so we don't end up ;; building everything in the temporary test store. @@ -147,6 +149,9 @@ no external store to talk to." ;; further. (unsetenv "NIX_STORE_DIR")) (lambda () + (when store + ;; Make sure we don't end up rebuilding the world for those tests. + (set-build-options store #:timeout (* 10 60))) (proc store)) (lambda () (when store-variable -- cgit v1.2.3