diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-02-25 20:35:11 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-02-25 21:51:05 +0000 |
| commit | ca0994819d68aee26a2906c37a47ae609ac46c4c (patch) | |
| tree | c96805c008c22926b1eaadc340a99323d53be532 /tests/common.sh.in | |
| parent | 10e81bf871551901ff0383bdede0f79325e93867 (diff) | |
| parent | c189031e8be0530d73a817571ad7f81ad5eedce6 (diff) | |
Merge remote-tracking branch 'upstream/master' into path-info
Diffstat (limited to 'tests/common.sh.in')
| -rw-r--r-- | tests/common.sh.in | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/common.sh.in b/tests/common.sh.in index 5e00d64f1..e3bcab507 100644 --- a/tests/common.sh.in +++ b/tests/common.sh.in @@ -34,7 +34,6 @@ coreutils=@coreutils@ export dot=@dot@ export SHELL="@bash@" export PAGER=cat -export HAVE_SODIUM="@HAVE_SODIUM@" export busybox="@sandbox_shell@" export version=@PACKAGE_VERSION@ @@ -74,7 +73,7 @@ startDaemon() { # Start the daemon, wait for the socket to appear. !!! # ‘nix-daemon’ should have an option to fork into the background. rm -f $NIX_STATE_DIR/daemon-socket/socket - nix-daemon & + nix daemon & for ((i = 0; i < 30; i++)); do if [ -e $NIX_DAEMON_SOCKET_PATH ]; then break; fi sleep 1 |