diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2011-07-20T11·50+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2011-07-20T11·50+0000 |
| commit | 4bdb51e621e2690e561b7581d5670af08e7b3170 (patch) | |
| tree | dc7e24f8890d2ae8bf59fbf5a6c31feae73e20f7 /tests/remote-store.sh | |
| parent | 0243eea4b92ca1598353e31b7e3c0d195c903221 (diff) | |
* Refactoring.
Diffstat (limited to 'tests/remote-store.sh')
| -rw-r--r-- | tests/remote-store.sh | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/tests/remote-store.sh b/tests/remote-store.sh index 260fdeb764a9..e27631a006ea 100644 --- a/tests/remote-store.sh +++ b/tests/remote-store.sh @@ -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 |