diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-07-06 16:40:10 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2020-07-06 16:40:10 +0200 |
| commit | 54712aaf8a4d9d6a42232fe9b360fc72f35ed02d (patch) | |
| tree | 02f1ad7cb8628ed5877ed411a7ed67b3c0917da9 /tests/common.sh.in | |
| parent | 6ff9aa8df7ce8266147f74c65e2cc529a1e72ce0 (diff) | |
| parent | 14227aeb327798a1446ddde59fc561c3d2e6b7a8 (diff) | |
Merge remote-tracking branch 'origin/master' into flakes
Diffstat (limited to 'tests/common.sh.in')
| -rw-r--r-- | tests/common.sh.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/common.sh.in b/tests/common.sh.in index 73fe77345..308126094 100644 --- a/tests/common.sh.in +++ b/tests/common.sh.in @@ -1,6 +1,6 @@ set -e -export TEST_ROOT=$(realpath ${TMPDIR:-/tmp}/nix-test) +export TEST_ROOT=$(realpath ${TMPDIR:-/tmp}/nix-test)/${TEST_NAME:-default} export NIX_STORE_DIR if ! NIX_STORE_DIR=$(readlink -f $TEST_ROOT/store 2> /dev/null); then # Maybe the build directory is symlinked. @@ -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=$! |