diff options
| -rw-r--r-- | tests/common.sh.in | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tests/common.sh.in b/tests/common.sh.in index 49068f1c3..e485329ba 100644 --- a/tests/common.sh.in +++ b/tests/common.sh.in @@ -90,12 +90,18 @@ startDaemon() { # Start the daemon, wait for the socket to appear. !!! # ‘nix-daemon’ should have an option to fork into the background. rm -f $NIX_DAEMON_SOCKET_PATH - PATH=$DAEMON_PATH nix daemon & + PATH=$DAEMON_PATH nix-daemon& + pidDaemon=$! for ((i = 0; i < 300; i++)); do - if [[ -S $NIX_DAEMON_SOCKET_PATH ]]; then break; fi + if [[ -S $NIX_DAEMON_SOCKET_PATH ]]; then + DAEMON_STARTED=1 + break; + fi sleep 0.1 done - pidDaemon=$! + if [[ -z ${DAEMON_STARTED+x} ]]; then + fail "Didn’t manage to start the daemon" + fi trap "killDaemon" EXIT export NIX_REMOTE=daemon } |