diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-11-04 23:41:33 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-11-04 23:41:33 +0100 |
| commit | 01e82af55fa9823be36e2bd94868bb7b32f0fd73 (patch) | |
| tree | 1a22edbe37304547898a145315477cc77420ea92 /tests | |
| parent | bde2d9cf8d4cbb2fdd12fc6cafc96f20d56d73a3 (diff) | |
| download | patches-01e82af55fa9823be36e2bd94868bb7b32f0fd73.tar patches-01e82af55fa9823be36e2bd94868bb7b32f0fd73.tar.gz | |
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.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/derivations.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/derivations.scm b/tests/derivations.scm index 5f1ca56b50..273db22765 100644 --- a/tests/derivations.scm +++ b/tests/derivations.scm @@ -419,8 +419,8 @@ (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 @@ (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) |