diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-01T14·37+0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-01T14·37+0100 |
| commit | 762ef464f843a0fe50e25ba07d11296b1540080e (patch) | |
| tree | eec55b6c21c29dffeb52ad19c3a49c5e7323814b | |
| parent | 844d83352c23db4a3131ac2b11b9ed2af03cdfd6 (diff) | |
Fix the nix-profile test
| -rw-r--r-- | release.nix | 1 | ||||
| -rw-r--r-- | tests/common.sh.in | 1 | ||||
| -rw-r--r-- | tests/nix-profile.sh | 4 |
3 files changed, 3 insertions, 3 deletions
diff --git a/release.nix b/release.nix index 8d395189e248..c1618d176ac0 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 633769ae2c1e..2bbc39c28a84 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 a00864c97708..3586a7efc3c8 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 ] |