kloenk/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Fix the nix-profile test

Browse source
This commit is contained in:
Eelco Dolstra 2014-02-01 15:37:50 +01:00
parent 844d83352c
commit 762ef464f8
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
release.nix
View file

@ -102,6 +102,7 @@ let
installFlags = "sysconfdir=$(out)/etc"; installFlags = "sysconfdir=$(out)/etc";
doInstallCheck = true; doInstallCheck = true;
installCheckFlags = "sysconfdir=$(out)/etc";
}); });

1
tests/common.sh.in
View file

@ -1,7 +1,6 @@
set -e set -e
datadir="@datadir@" datadir="@datadir@"
profiledir="@sysconfdir@/profile.d"
export TEST_ROOT=$(pwd)/test-tmp export TEST_ROOT=$(pwd)/test-tmp
export NIX_STORE_DIR export NIX_STORE_DIR

4
tests/nix-profile.sh
View file

@ -3,8 +3,8 @@ source common.sh
home=$TEST_ROOT/home home=$TEST_ROOT/home
rm -rf $home rm -rf $home
mkdir -p $home mkdir -p $home
HOME=$home $SHELL -e -c ". $profiledir/nix.sh" HOME=$home $SHELL -e -c ". ../scripts/nix-profile.sh"
HOME=$home $SHELL -e -c ". $profiledir/nix.sh" # test idempotency HOME=$home $SHELL -e -c ". ../scripts/nix-profile.sh" # test idempotency
[ -L $home/.nix-profile ] [ -L $home/.nix-profile ]
[ -e $home/.nix-channels ] [ -e $home/.nix-channels ]