TakeV
/
guix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Hopefully this fixes the test on FreeBSD.

This commit is contained in:
Eelco Dolstra 2007-08-14 13:43:51 +00:00
parent ffa1c61cd5
commit 5c793ad03e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/common.sh.in
View File

@ -2,7 +2,7 @@ set -e
export TEST_ROOT=$(pwd)/test-tmp export TEST_ROOT=$(pwd)/test-tmp
export NIX_STORE_DIR 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. # Maybe the build directory is symlinked.
export NIX_IGNORE_SYMLINK_STORE=1 export NIX_IGNORE_SYMLINK_STORE=1
NIX_STORE_DIR=$TEST_ROOT/store NIX_STORE_DIR=$TEST_ROOT/store

4
tests/remote-store.sh
View File

@ -5,13 +5,13 @@ export FORCE_NIX_REMOTE=1
echo '*** testing slave mode ***' echo '*** testing slave mode ***'
clearStore clearStore
clearManifests clearManifests
NIX_REMOTE=slave sh ./user-envs.sh NIX_REMOTE=slave $SHELL ./user-envs.sh
echo '*** testing daemon mode ***' echo '*** testing daemon mode ***'
clearStore clearStore
clearManifests clearManifests
$nixworker --daemon & $nixworker --daemon &
pidDaemon=$! pidDaemon=$!
NIX_REMOTE=daemon sh ./user-envs.sh NIX_REMOTE=daemon $SHELL ./user-envs.sh
kill -9 $pidDaemon kill -9 $pidDaemon
wait $pidDaemon || true wait $pidDaemon || true