From 01e82af55fa9823be36e2bd94868bb7b32f0fd73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 4 Nov 2013 23:41:33 +0100
Subject: [PATCH] tests: Fix max-silent-time test.
* tests/derivations.scm ("build-expression->derivation and
max-silent-time"): Use STORE instead of %STORE. Change BUILDER to
succeed by default. Return #f when no exception is raised.
---
tests/derivations.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/derivations.scm b/tests/derivations.scm
index 5f1ca56b50e..273db227657 100644
--- a/tests/derivations.scm
+++ b/tests/derivations.scm
@@ -419,8 +419,8 @@ (define %coreutils
(let* ((store (let ((s (open-connection)))
(set-build-options s #:max-silent-time 1)
s))
- (builder '(sleep 100))
- (drv (build-expression->derivation %store "silent"
+ (builder '(begin (sleep 100) (mkdir %output) #t))
+ (drv (build-expression->derivation store "silent"
(%current-system)
builder '()))
(out-path (derivation->output-path drv)))
@@ -428,7 +428,8 @@ (define %coreutils
(and (string-contains (nix-protocol-error-message c)
"failed")
(not (valid-path? store out-path)))))
- (build-derivations %store (list drv)))))
+ (build-derivations store (list drv))
+ #f)))
(test-assert "build-expression->derivation and derivation-prerequisites-to-build"
(let ((drv (build-expression->derivation %store "fail" (%current-system)
--
GitLab