[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/07: tests: Make the daemon socket explicit in guix-register test.
From: |
Ludovic Courtès |
Subject: |
05/07: tests: Make the daemon socket explicit in guix-register test. |
Date: |
Wed, 10 Jun 2015 12:00:46 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit 4ae1fe14b90dba3b3394852079783ca43272a675
Author: Ludovic Courtès <address@hidden>
Date: Wed Jun 10 11:11:52 2015 +0200
tests: Make the daemon socket explicit in guix-register test.
* tests/guix-register.sh: Define GUIX_DAEMON_SOCKET. Pass it explicitly to
'open-connection'.
---
tests/guix-register.sh | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/guix-register.sh b/tests/guix-register.sh
index 7084ac6..30bc59a 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
- branch master updated (329d13b -> 8ac0368), Ludovic Courtès, 2015/06/10
- 05/07: tests: Make the daemon socket explicit in guix-register test.,
Ludovic Courtès <=
- 02/07: ui: Replace the global 'symlink' binding., Ludovic Courtès, 2015/06/10
- 04/07: guix system: init: Overwrite the items in the target store., Ludovic Courtès, 2015/06/10
- 07/07: guix-register: Use C++11 range 'for' loop instead of 'foreach' macro., Ludovic Courtès, 2015/06/10
- 06/07: guix-register: Perform deduplication even when --prefix is passed., Ludovic Courtès, 2015/06/10
- 03/07: install: Really overwrite TARGET/var/guix/profiles/system-1-link., Ludovic Courtès, 2015/06/10
- 01/07: doc: Add 'help2man' to HACKING., Ludovic Courtès, 2015/06/10