diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-02 23:52:15 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-02 23:52:15 +0100 |
| commit | 0a4e90395c3286a246b816575351b9f2016976ba (patch) | |
| tree | ac140c3a27e321622edfadaa7a8c122dea2dd450 /tests | |
| parent | f12492c66dc5c71c22ce2eb1788dacd86b1dfb1f (diff) | |
Urgggh
http://hydra.nixos.org/build/3661100
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/common.sh.in | 2 | ||||
| -rw-r--r-- | tests/nix-profile.sh | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index df3c9c600..38cf7b1bd 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -14,6 +14,8 @@ TESTS = init.sh hash.sh lang.sh add.sh simple.sh dependencies.sh \ XFAIL_TESTS = +profiledir = $(sysconfdir)/profile.d + include ../substitute.mk $(TESTS): common.sh config.nix diff --git a/tests/common.sh.in b/tests/common.sh.in index f327ad727..2ae34603f 100644 --- a/tests/common.sh.in +++ b/tests/common.sh.in @@ -1,7 +1,7 @@ set -e datadir="@datadir@" -sysconfdir="@sysconfdir@" +profiledir="@profiledir@" export TEST_ROOT=$(pwd)/test-tmp export NIX_STORE_DIR diff --git a/tests/nix-profile.sh b/tests/nix-profile.sh index c9c756b60..a00864c97 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 ". $sysconfdir/profile.d/nix.sh" -HOME=$home $SHELL -e -c ". $sysconfdir/profile.d/nix.sh" # test idempotency +HOME=$home $SHELL -e -c ". $profiledir/nix.sh" +HOME=$home $SHELL -e -c ". $profiledir/nix.sh" # test idempotency [ -L $home/.nix-profile ] [ -e $home/.nix-channels ] |