diff --git a/tests/common.sh.in b/tests/common.sh.in index 756c20c9..e721c369 100644 --- a/tests/common.sh.in +++ b/tests/common.sh.in @@ -22,6 +22,7 @@ export HOME=$TEST_HOME mkdir -p $TEST_HOME export PATH=@bindir@:$PATH +coreutils=@coreutils@ export NIX_BUILD_HOOK= export dot=@dot@ diff --git a/tests/nix-profile.sh b/tests/nix-profile.sh index 2cc3910b..b244815e 100644 --- a/tests/nix-profile.sh +++ b/tests/nix-profile.sh @@ -1,10 +1,14 @@ source common.sh +sed -e "s|@localstatedir@|$TEST_ROOT/profile-var|g" -e "s|@coreutils@|$coreutils|g" < ../scripts/nix-profile.sh.in > $TEST_ROOT/nix-profile.sh + user=$(whoami) -rm -rf $TEST_HOME +rm -rf $TEST_HOME $TEST_ROOT/profile-var mkdir -p $TEST_HOME -USER=$user $SHELL -e -c ". ../scripts/nix-profile.sh" -USER=$user $SHELL -e -c ". ../scripts/nix-profile.sh" # test idempotency +USER=$user $SHELL -e -c ". $TEST_ROOT/nix-profile.sh; set" +USER=$user $SHELL -e -c ". $TEST_ROOT/nix-profile.sh" # test idempotency [ -L $TEST_HOME/.nix-profile ] [ -e $TEST_HOME/.nix-channels ] +[ -e $TEST_ROOT/profile-var/nix/gcroots/per-user/$user ] +[ -e $TEST_ROOT/profile-var/nix/profiles/per-user/$user ]