summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-07-05 19:07:38 +0200
committerLudovic Courtès <ludo@gnu.org>2014-07-05 19:15:08 +0200
commit8ad49499b98b53ac105acd6fe58225b37e60e40b (patch)
tree93fd4bf4a177cf0dc660ccb3a41f1fde4f5b2e10 /tests
parent8731e527496ee6834cfbfb786186d49ff0c0cfab (diff)
downloadpatches-8ad49499b98b53ac105acd6fe58225b37e60e40b.tar
patches-8ad49499b98b53ac105acd6fe58225b37e60e40b.tar.gz
build: Support running the test suite from a directory with symlinks.
Fixes <http://bugs.gnu.org/17935>. Reported by Alex Kost <alezost@gmail.com>. * test-env.in: Canonicalize $NIX_STORE_DIR, and remove $NIX_IGNORE_SYMLINK_STORE setting. * tests/guix-register.sh: Likewise, canonicalize $new_store_dir and $new_store and leave $NIX_IGNORE_SYMLINK_STORE unchanged.
Diffstat (limited to 'tests')
-rw-r--r--tests/guix-register.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/guix-register.sh b/tests/guix-register.sh
index 019a451b3b..28b799b5c1 100644
--- a/tests/guix-register.sh
+++ b/tests/guix-register.sh
@@ -57,8 +57,8 @@ guile -c "
#
mkdir -p "$new_store/$storedir"
-new_store_dir="`cd "$new_store/$storedir" ; pwd`"
-new_store="`cd "$new_store" ; pwd`"
+new_store_dir="`cd "$new_store/$storedir" ; pwd -P`"
+new_store="`cd "$new_store" ; pwd -P`"
to_copy="`guix build guile-bootstrap`"
cp -r "$to_copy" "$new_store_dir"
@@ -81,7 +81,6 @@ guix-register --prefix "$new_store" "$closure"
# Now make sure this is recognized as valid.
-NIX_IGNORE_SYMLINK_STORE=1
NIX_STORE_DIR="$new_store_dir"
NIX_STATE_DIR="$new_store$localstatedir"
NIX_LOG_DIR="$new_store$localstatedir/log/guix"