diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2011-10-10T21·32+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2011-10-10T21·32+0000 |
| commit | 8af7d766f0244d5b15d89ab2d2d66b0d63e8f576 (patch) | |
| tree | 3346cb494de0bf35403d812efd8b757595cd44d6 /tests/common.sh.in | |
| parent | cd6d02c366af43bccdd2ef345193e4fdeca78a13 (diff) | |
* Refactoring: remove unnecessary variables from the tests.
Diffstat (limited to 'tests/common.sh.in')
| -rw-r--r-- | tests/common.sh.in | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/tests/common.sh.in b/tests/common.sh.in index 4a2c96daf706..567f5b460651 100644 --- a/tests/common.sh.in +++ b/tests/common.sh.in @@ -47,13 +47,6 @@ export SHELL="@shell@" export version=@version@ export system=@system@ -export nixinstantiate=$TOP/src/nix-instantiate/nix-instantiate -export nixstore=$TOP/src/nix-store/nix-store -export nixenv=$TOP/src/nix-env/nix-env -export nixhash=$TOP/src/nix-hash/nix-hash -export nixworker=$TOP/src/nix-worker/nix-worker -export nixbuild=$NIX_BIN_DIR/nix-build - readLink() { ls -l "$1" | sed 's/.*->\ //' } @@ -70,7 +63,7 @@ clearStore() { mkdir "$NIX_STORE_DIR" rm -rf "$NIX_DB_DIR" mkdir "$NIX_DB_DIR" - $nixstore --init + nix-store --init clearProfiles rm -f "$NIX_STATE_DIR"/gcroots/auto/* rm -f "$NIX_STATE_DIR"/gcroots/ref @@ -81,7 +74,7 @@ clearManifests() { } startDaemon() { - $nixworker --daemon & + nix-worker --daemon & pidDaemon=$! trap "kill -9 $pidDaemon" EXIT export NIX_REMOTE=daemon |