From 8af7d766f0244d5b15d89ab2d2d66b0d63e8f576 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon, 10 Oct 2011 21:32:34 +0000
Subject: * Refactoring: remove unnecessary variables from the tests.

---
 tests/common.sh.in | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'tests/common.sh.in')

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
-- 
cgit 1.4.1