about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2011-12-14T22·31+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2011-12-14T22·31+0000
commit23bf700196b4fa05a2da55798644f8adc2e1d7b1 (patch)
treef8e3186b64eef9976f7ac4143b871a2df245a581
parentc8c0380744afd107611bba17127a182ecebd4e0b (diff)
* Oops, the daemon test wasn't actually using the daemon.
-rw-r--r--tests/Makefile.am2
-rw-r--r--tests/common.sh.in2
2 files changed, 1 insertions, 3 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 676a9c387b18..38bfa139d767 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-TESTS_ENVIRONMENT = $(bash) -e
+TESTS_ENVIRONMENT = NIX_REMOTE= $(bash) -e
 
 extra1 = $(shell pwd)/test-tmp/shared
 
diff --git a/tests/common.sh.in b/tests/common.sh.in
index 62ac669df665..4ab490a62645 100644
--- a/tests/common.sh.in
+++ b/tests/common.sh.in
@@ -23,8 +23,6 @@ export SHARED=$TEST_ROOT/shared
 
 export PATH=$NIX_BIN_DIR:$TOP/scripts:$PATH
 
-export NIX_REMOTE=
-
 export REAL_BIN_DIR=@bindir@
 export REAL_LIBEXEC_DIR=@libexecdir@
 export REAL_LOCALSTATE_DIR=@localstatedir@