diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2019-02-06 13:03:26 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2019-02-06 13:03:26 +0100 |
| commit | ba88eea2b3a8a33ecd7fc0ec64e3917c6c2fe21d (patch) | |
| tree | 75c68e44d3d76440f416552711b1a47ec83e411e /tests/guix-daemon.sh | |
| parent | f380f9d55e6757c242acf6c71c4a3ccfcdb066b2 (diff) | |
| parent | 4aeb7f34c948f32363f2ae29c6942c6328df758c (diff) | |
| download | patches-ba88eea2b3a8a33ecd7fc0ec64e3917c6c2fe21d.tar patches-ba88eea2b3a8a33ecd7fc0ec64e3917c6c2fe21d.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'tests/guix-daemon.sh')
| -rw-r--r-- | tests/guix-daemon.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/guix-daemon.sh b/tests/guix-daemon.sh index 9ae6e0b77a..ce82cfd1e6 100644 --- a/tests/guix-daemon.sh +++ b/tests/guix-daemon.sh @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2012, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2012, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> # # This file is part of GNU Guix. # @@ -63,7 +63,7 @@ guile -c " (exit (has-substitutes? store \"$out\"))" # Now, run guix-daemon --no-substitutes. -socket="$NIX_STATE_DIR/alternate-socket" +socket="$GUIX_STATE_DIRECTORY/alternate-socket" guix-daemon --no-substitutes --listen="$socket" --disable-chroot & daemon_pid=$! trap 'kill $daemon_pid' EXIT @@ -109,7 +109,7 @@ guile -c " (define (build-without-failing drv) (lambda (store) - (guard (c ((nix-protocol-error? c) (values #t store))) + (guard (c ((store-protocol-error? c) (values #t store))) (build-derivations store (list drv)) (values #f store)))) @@ -177,9 +177,9 @@ client_code=' `("-e" ,build) #:inputs `((,bash) (,build)) #:env-vars `(("x" . ,(random-text)))))) - (exit (guard (c ((nix-protocol-error? c) + (exit (guard (c ((store-protocol-error? c) (->bool - (string-contains (pk (nix-protocol-error-message c)) + (string-contains (pk (store-protocol-error-message c)) "failed")))) (build-derivations store (list drv)) #f))))' |