about summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2011-12-16T23·33+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2011-12-16T23·33+0000
commit194d21f9f63ceb034f3e8294f89aa6bf6a217bc9 (patch)
tree7eb6da5955482a82f4d34b60dcb10514a4a55f59 /tests
parent3c3107da86ff71a08ce44027ee5899acf486796a (diff)
parent273b288a7e862ac1918064537ff130cc751fa9fd (diff)
* Sync with the trunk.
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am2
-rw-r--r--tests/common.sh.in2
-rw-r--r--tests/remote-builds.nix1
-rw-r--r--tests/user-envs.sh2
4 files changed, 3 insertions, 4 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0418f73e6cf5..8b5aa4bd99d0 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@
diff --git a/tests/remote-builds.nix b/tests/remote-builds.nix
index 201ca9dba19b..de127b8aee16 100644
--- a/tests/remote-builds.nix
+++ b/tests/remote-builds.nix
@@ -72,6 +72,7 @@ in
       $client->succeed("chmod 600 /root/.ssh/id_dsa");
 
       # Install the SSH key on the slaves.
+      $client->waitForJob("network-interfaces");
       foreach my $slave ($slave1, $slave2) {
           $slave->succeed("mkdir -m 700 /root/.ssh");
           $slave->copyFileFromHost("key.pub", "/root/.ssh/authorized_keys");
diff --git a/tests/user-envs.sh b/tests/user-envs.sh
index 025a5ff81716..5037e28b916b 100644
--- a/tests/user-envs.sh
+++ b/tests/user-envs.sh
@@ -36,7 +36,7 @@ nix-env -p $profiles/test -q '*' | grep -q foo-2.0pre1
 test "$($profiles/test/bin/foo)" = "foo-2.0pre1"
 
 # Upgrade "foo": should install foo-2.0.
-nix-env -p $profiles/test -f ./user-envs.nix -u foo
+NIX_PATH=nixpkgs=./user-envs.nix nix-env -p $profiles/test -f '<nixpkgs>' -u foo
 
 # Query installed: should contain foo-2.0 now.
 test "$(nix-env -p $profiles/test -q '*' | wc -l)" -eq 1