* Refactoring.

This commit is contained in:
Eelco Dolstra 2011-07-20 11:50:13 +00:00
parent 0243eea4b9
commit 4bdb51e621
2 changed files with 17 additions and 12 deletions

View file

@ -1,7 +1,5 @@
source common.sh
export FORCE_NIX_REMOTE=1
echo '*** testing slave mode ***'
clearStore
clearManifests
@ -10,10 +8,6 @@ NIX_REMOTE=slave $SHELL ./user-envs.sh
echo '*** testing daemon mode ***'
clearStore
clearManifests
$nixworker --daemon &
pidDaemon=$!
trap "kill -9 $pidDaemon" EXIT
NIX_REMOTE=daemon $SHELL ./user-envs.sh
kill -9 $pidDaemon
wait $pidDaemon || true
trap "" EXIT
startDaemon
$SHELL ./user-envs.sh
killDaemon