diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-07-10 18:13:45 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2020-07-10 18:13:45 -0400 |
| commit | acb74d4d94b38295d606ed45dc074b3e9083e188 (patch) | |
| tree | 92cc4bfdd1d97bae6484e5038943c17f2b190f60 /tests/common.sh.in | |
| parent | fc2ab42e86e0b75250a666eeb5e25705a2ab83ef (diff) | |
| parent | 8efa23bb996161af74f89401902450e51e9d4b54 (diff) | |
Merge remote-tracking branch 'origin/master' into substitute-other-storedir
Diffstat (limited to 'tests/common.sh.in')
| -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=$! |