about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-07-26T21·12-0400
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-07-26T21·12-0400
commit7861260a5ff33689b1b8f7a89489f5d5e5e4dfcb (patch)
treea03d4baf2b450e87ef69142a04c3a73783382d4a
parent7892ad15ab4b6db0eee619a1fdd14fed129db252 (diff)
Clear NIX_STORE when running the tests
-rw-r--r--tests/common.sh.in1
-rw-r--r--tests/remote-store.sh2
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/common.sh.in b/tests/common.sh.in
index 031a0d66d1b8..abefb7e25094 100644
--- a/tests/common.sh.in
+++ b/tests/common.sh.in
@@ -16,6 +16,7 @@ export NIX_DB_DIR=$TEST_ROOT/db
 export NIX_CONF_DIR=$TEST_ROOT/etc
 export NIX_MANIFESTS_DIR=$TEST_ROOT/var/nix/manifests
 export SHARED=$TEST_ROOT/shared
+export NIX_REMOTE=$NIX_REMOTE_
 
 export PATH=@bindir@:$PATH
 
diff --git a/tests/remote-store.sh b/tests/remote-store.sh
index e27631a006ea..ef289ab79a1a 100644
--- a/tests/remote-store.sh
+++ b/tests/remote-store.sh
@@ -3,7 +3,7 @@ source common.sh
 echo '*** testing slave mode ***'
 clearStore
 clearManifests
-NIX_REMOTE=slave $SHELL ./user-envs.sh
+NIX_REMOTE_=slave $SHELL ./user-envs.sh
 
 echo '*** testing daemon mode ***'
 clearStore