From 762ef464f843a0fe50e25ba07d11296b1540080e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 1 Feb 2014 15:37:50 +0100 Subject: [PATCH] Fix the nix-profile test --- release.nix | 1 + tests/common.sh.in | 1 - tests/nix-profile.sh | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/release.nix b/release.nix index 8d395189..c1618d17 100644 --- a/release.nix +++ b/release.nix @@ -102,6 +102,7 @@ let installFlags = "sysconfdir=$(out)/etc"; doInstallCheck = true; + installCheckFlags = "sysconfdir=$(out)/etc"; }); diff --git a/tests/common.sh.in b/tests/common.sh.in index 633769ae..2bbc39c2 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 a00864c9..3586a7ef 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 ]