summaryrefslogtreecommitdiff
path: root/tests/guix-pack-localstatedir.sh
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-05-18 12:21:34 +0200
committerLudovic Courtès <ludo@gnu.org>2019-05-18 12:23:31 +0200
commitbaab87ac49e3f0f873e17eb16db9781189b1f2d1 (patch)
tree3052fa9b73844887cf082f8029165b8997424bb6 /tests/guix-pack-localstatedir.sh
parent6b97415996583b15a97dad8254f610275353e913 (diff)
pack: '--localstatedir' and '-R' tests gracefully handle missing /gnu/store.
Fixes <https://bugs.gnu.org/35776>. Reported by Ting-Wei Lan <lantw44@gmail.com>. * tests/guix-pack-localstatedir.sh: Set 'storedir' before 'NIX_STORE_DIR'. * tests/guix-pack-relocatable.sh: Likewise.
Diffstat (limited to 'tests/guix-pack-localstatedir.sh')
-rw-r--r--tests/guix-pack-localstatedir.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/guix-pack-localstatedir.sh b/tests/guix-pack-localstatedir.sh
index b734b0f7e3a..042887ea9b3 100644
--- a/tests/guix-pack-localstatedir.sh
+++ b/tests/guix-pack-localstatedir.sh
@@ -1,5 +1,5 @@
1# GNU Guix --- Functional package management for GNU 1# GNU Guix --- Functional package management for GNU
2# Copyright © 2018 Ludovic Courtès <ludo@gnu.org> 2# Copyright © 2018, 2019 Ludovic Courtès <ludo@gnu.org>
3# 3#
4# This file is part of GNU Guix. 4# This file is part of GNU Guix.
5# 5#
@@ -27,8 +27,9 @@ guix pack --version
27# the test in the user's global store if possible, on the grounds that 27# the test in the user's global store if possible, on the grounds that
28# binaries may already be there or can be built or downloaded inexpensively. 28# binaries may already be there or can be built or downloaded inexpensively.
29 29
30NIX_STORE_DIR="`guile -c '(use-modules (guix config))(display %storedir)'`" 30storedir="`guile -c '(use-modules (guix config))(display %storedir)'`"
31localstatedir="`guile -c '(use-modules (guix config))(display %localstatedir)'`" 31localstatedir="`guile -c '(use-modules (guix config))(display %localstatedir)'`"
32NIX_STORE_DIR="$storedir"
32GUIX_DAEMON_SOCKET="$localstatedir/guix/daemon-socket/socket" 33GUIX_DAEMON_SOCKET="$localstatedir/guix/daemon-socket/socket"
33export NIX_STORE_DIR GUIX_DAEMON_SOCKET 34export NIX_STORE_DIR GUIX_DAEMON_SOCKET
34 35