diff options
| author | regnat <rg@regnat.ovh> | 2020-07-02 17:18:03 +0200 |
|---|---|---|
| committer | regnat <rg@regnat.ovh> | 2020-07-03 09:20:01 +0200 |
| commit | 223fbe644a4cde45269c01e971331d9414971d46 (patch) | |
| tree | 8996313d00c6ee38b732f43f8d096a7279219ff5 /tests | |
| parent | 5101ed18bca509a8cf43668b0701afad90c5c9c4 (diff) | |
Shorten the path to the test root
Fix a socket length failure on the OSX builders
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/common.sh.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/common.sh.in b/tests/common.sh.in index c00ee58a1..308126094 100644 --- a/tests/common.sh.in +++ b/tests/common.sh.in @@ -11,6 +11,7 @@ export NIX_LOCALSTATE_DIR=$TEST_ROOT/var export NIX_LOG_DIR=$TEST_ROOT/var/log/nix export NIX_STATE_DIR=$TEST_ROOT/var/nix export NIX_CONF_DIR=$TEST_ROOT/etc +export NIX_DAEMON_SOCKET_PATH=$TEST_ROOT/daemon-socket unset NIX_USER_CONF_FILES export _NIX_TEST_SHARED=$TEST_ROOT/shared if [[ -n $NIX_STORE ]]; then @@ -76,7 +77,7 @@ startDaemon() { rm -f $NIX_STATE_DIR/daemon-socket/socket nix-daemon & for ((i = 0; i < 30; i++)); do - if [ -e $NIX_STATE_DIR/daemon-socket/socket ]; then break; fi + if [ -e $NIX_DAEMON_SOCKET_PATH ]; then break; fi sleep 1 done pidDaemon=$! |