aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-06-10 11:11:52 +0200
committerLudovic Courtès <ludo@gnu.org>2015-06-10 11:11:52 +0200
commit4ae1fe14b90dba3b3394852079783ca43272a675 (patch)
tree33c45a8bc346487e6dab1991fa3856e9931d6a05
parent78acff7c11507c68b63ad289b2bbe396602b9dcf (diff)
downloadguix-4ae1fe14b90dba3b3394852079783ca43272a675.tar
guix-4ae1fe14b90dba3b3394852079783ca43272a675.tar.gz
tests: Make the daemon socket explicit in guix-register test.
* tests/guix-register.sh: Define GUIX_DAEMON_SOCKET. Pass it explicitly to 'open-connection'.
-rw-r--r--tests/guix-register.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/guix-register.sh b/tests/guix-register.sh
index 7084ac6b8c..30bc59a314 100644
--- a/tests/guix-register.sh
+++ b/tests/guix-register.sh
@@ -107,12 +107,13 @@ do
NIX_STATE_DIR="$new_store$state_dir"
NIX_LOG_DIR="$new_store$state_dir/log/guix"
NIX_DB_DIR="$new_store$state_dir/db"
+ GUIX_DAEMON_SOCKET="$NIX_STATE_DIR/daemon-socket/socket"
export NIX_IGNORE_SYMLINK_STORE NIX_STORE_DIR NIX_STATE_DIR \
- NIX_LOG_DIR NIX_DB_DIR
+ NIX_LOG_DIR NIX_DB_DIR GUIX_DAEMON_SOCKET
# Check whether we overflow the limitation on local socket name lengths.
- if [ `echo "$NIX_STATE_DIR/daemon-socket/socket" | wc -c` -ge 108 ]
+ if [ `echo "$GUIX_DAEMON_SOCKET" | wc -c` -ge 108 ]
then
# Mark the test as skipped even though we already did some work so
# that the remainder is not silently skipped.
@@ -131,7 +132,7 @@ do
# us because of the wrong prefix. So we just list dead paths instead.
guile -c "
(use-modules (guix store))
- (define s (open-connection))
+ (define s (open-connection \"$GUIX_DAEMON_SOCKET\"))
(exit (equal? (list \"$copied\") (dead-paths s)))"
# Kill the daemon so we can access the database below (otherwise we may