diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-03-17 23:30:21 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-03-17 23:30:42 +0100 |
| commit | aa2480e50d713b90805336ab48477ba596aef531 (patch) | |
| tree | 8fa61631b5d5178624f6f6dd1e1207eb3985034c | |
| parent | 32beec1cd9cbc3a04a0703e5eb10be4a34028192 (diff) | |
| download | gnu-guix-aa2480e50d713b90805336ab48477ba596aef531.tar gnu-guix-aa2480e50d713b90805336ab48477ba596aef531.tar.gz | |
build: Fix test failures due to the nix -> guix directory name change.
Reported by Nikita Karetnikov <nikita@karetnikov.org>
and Pierre-Antoine Rault <par@rigelk.eu>.
* test-env.in: Change 'NIX_LOG_DIR' in accordance with f5768af.
* tests/guix-register.sh: Likewise for 'NIX_LOG_DIR' and 'NIX_DB_DIR'.
| -rw-r--r-- | test-env.in | 2 | ||||
| -rw-r--r-- | tests/guix-register.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test-env.in b/test-env.in index 9b5817f4ee..3853ce91ef 100644 --- a/test-env.in +++ b/test-env.in @@ -30,7 +30,7 @@ then NIX_IGNORE_SYMLINK_STORE=1 # in case the store is a symlink NIX_STORE_DIR="@GUIX_TEST_ROOT@/store" NIX_LOCALSTATE_DIR="@GUIX_TEST_ROOT@/var" - NIX_LOG_DIR="@GUIX_TEST_ROOT@/var/log/nix" + NIX_LOG_DIR="@GUIX_TEST_ROOT@/var/log/guix" NIX_DB_DIR="@GUIX_TEST_ROOT@/db" NIX_ROOT_FINDER="@abs_top_builddir@/nix/scripts/list-runtime-roots" diff --git a/tests/guix-register.sh b/tests/guix-register.sh index ee633af4f9..019a451b3b 100644 --- a/tests/guix-register.sh +++ b/tests/guix-register.sh @@ -84,8 +84,8 @@ guix-register --prefix "$new_store" "$closure" NIX_IGNORE_SYMLINK_STORE=1 NIX_STORE_DIR="$new_store_dir" NIX_STATE_DIR="$new_store$localstatedir" -NIX_LOG_DIR="$new_store$localstatedir/log/nix" -NIX_DB_DIR="$new_store$localstatedir/nix/db" +NIX_LOG_DIR="$new_store$localstatedir/log/guix" +NIX_DB_DIR="$new_store$localstatedir/guix/db" export NIX_IGNORE_SYMLINK_STORE NIX_STORE_DIR NIX_STATE_DIR \ NIX_LOG_DIR NIX_DB_DIR |