diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-05-18 12:21:34 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-05-18 12:23:31 +0200 |
| commit | baab87ac49e3f0f873e17eb16db9781189b1f2d1 (patch) | |
| tree | 3052fa9b73844887cf082f8029165b8997424bb6 /tests | |
| parent | 6b97415996583b15a97dad8254f610275353e913 (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')
| -rw-r--r-- | tests/guix-pack-localstatedir.sh | 5 | ||||
| -rw-r--r-- | tests/guix-pack-relocatable.sh | 3 |
2 files changed, 5 insertions, 3 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 | ||
| 30 | NIX_STORE_DIR="`guile -c '(use-modules (guix config))(display %storedir)'`" | 30 | storedir="`guile -c '(use-modules (guix config))(display %storedir)'`" |
| 31 | localstatedir="`guile -c '(use-modules (guix config))(display %localstatedir)'`" | 31 | localstatedir="`guile -c '(use-modules (guix config))(display %localstatedir)'`" |
| 32 | NIX_STORE_DIR="$storedir" | ||
| 32 | GUIX_DAEMON_SOCKET="$localstatedir/guix/daemon-socket/socket" | 33 | GUIX_DAEMON_SOCKET="$localstatedir/guix/daemon-socket/socket" |
| 33 | export NIX_STORE_DIR GUIX_DAEMON_SOCKET | 34 | export NIX_STORE_DIR GUIX_DAEMON_SOCKET |
| 34 | 35 | ||
diff --git a/tests/guix-pack-relocatable.sh b/tests/guix-pack-relocatable.sh index c45a679bb14..ebada62c01d 100644 --- a/tests/guix-pack-relocatable.sh +++ b/tests/guix-pack-relocatable.sh | |||
| @@ -27,8 +27,9 @@ guix pack --version | |||
| 27 | # run it on the user's global store if possible, on the grounds that binaries | 27 | # run it on the user's global store if possible, on the grounds that binaries |
| 28 | # may already be there or can be built or downloaded inexpensively. | 28 | # may already be there or can be built or downloaded inexpensively. |
| 29 | 29 | ||
| 30 | NIX_STORE_DIR="`guile -c '(use-modules (guix config))(display %storedir)'`" | 30 | storedir="`guile -c '(use-modules (guix config))(display %storedir)'`" |
| 31 | localstatedir="`guile -c '(use-modules (guix config))(display %localstatedir)'`" | 31 | localstatedir="`guile -c '(use-modules (guix config))(display %localstatedir)'`" |
| 32 | NIX_STORE_DIR="$storedir" | ||
| 32 | GUIX_DAEMON_SOCKET="$localstatedir/guix/daemon-socket/socket" | 33 | GUIX_DAEMON_SOCKET="$localstatedir/guix/daemon-socket/socket" |
| 33 | export NIX_STORE_DIR GUIX_DAEMON_SOCKET | 34 | export NIX_STORE_DIR GUIX_DAEMON_SOCKET |
| 34 | 35 | ||