From 7861260a5ff33689b1b8f7a89489f5d5e5e4dfcb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 26 Jul 2012 17:12:42 -0400
Subject: [PATCH] Clear NIX_STORE when running the tests

---
 tests/common.sh.in    | 1 +
 tests/remote-store.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/common.sh.in b/tests/common.sh.in
index 031a0d66d1..abefb7e250 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 e27631a006..ef289ab79a 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