* Hopefully this fixes the test on FreeBSD.
This commit is contained in:
parent
ffa1c61cd5
commit
5c793ad03e
|
@ -2,7 +2,7 @@ set -e
|
|||
|
||||
export TEST_ROOT=$(pwd)/test-tmp
|
||||
export NIX_STORE_DIR
|
||||
if ! NIX_STORE_DIR=$(readlink -f $TEST_ROOT/store); then
|
||||
if ! NIX_STORE_DIR=$(readlink -f $TEST_ROOT/store 2> /dev/null); then
|
||||
# Maybe the build directory is symlinked.
|
||||
export NIX_IGNORE_SYMLINK_STORE=1
|
||||
NIX_STORE_DIR=$TEST_ROOT/store
|
||||
|
|
|
@ -5,13 +5,13 @@ export FORCE_NIX_REMOTE=1
|
|||
echo '*** testing slave mode ***'
|
||||
clearStore
|
||||
clearManifests
|
||||
NIX_REMOTE=slave sh ./user-envs.sh
|
||||
NIX_REMOTE=slave $SHELL ./user-envs.sh
|
||||
|
||||
echo '*** testing daemon mode ***'
|
||||
clearStore
|
||||
clearManifests
|
||||
$nixworker --daemon &
|
||||
pidDaemon=$!
|
||||
NIX_REMOTE=daemon sh ./user-envs.sh
|
||||
NIX_REMOTE=daemon $SHELL ./user-envs.sh
|
||||
kill -9 $pidDaemon
|
||||
wait $pidDaemon || true
|
||||
|
|
Loading…
Reference in a new issue