aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-02-01 15:37:50 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-02-01 15:37:50 +0100
commit762ef464f843a0fe50e25ba07d11296b1540080e (patch)
treeeec55b6c21c29dffeb52ad19c3a49c5e7323814b /tests
parent844d83352c23db4a3131ac2b11b9ed2af03cdfd6 (diff)
Fix the nix-profile test
Diffstat (limited to 'tests')
-rw-r--r--tests/common.sh.in1
-rw-r--r--tests/nix-profile.sh4
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/common.sh.in b/tests/common.sh.in
index 633769ae2..2bbc39c28 100644
--- a/tests/common.sh.in
+++ b/tests/common.sh.in
@@ -1,7 +1,6 @@
set -e
datadir="@datadir@"
-profiledir="@sysconfdir@/profile.d"
export TEST_ROOT=$(pwd)/test-tmp
export NIX_STORE_DIR
diff --git a/tests/nix-profile.sh b/tests/nix-profile.sh
index a00864c97..3586a7efc 100644
--- a/tests/nix-profile.sh
+++ b/tests/nix-profile.sh
@@ -3,8 +3,8 @@ source common.sh
home=$TEST_ROOT/home
rm -rf $home
mkdir -p $home
-HOME=$home $SHELL -e -c ". $profiledir/nix.sh"
-HOME=$home $SHELL -e -c ". $profiledir/nix.sh" # test idempotency
+HOME=$home $SHELL -e -c ". ../scripts/nix-profile.sh"
+HOME=$home $SHELL -e -c ". ../scripts/nix-profile.sh" # test idempotency
[ -L $home/.nix-profile ]
[ -e $home/.nix-channels ]