diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2012-01-03T12·59+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2012-01-03T12·59+0000 |
| commit | 6c31232e1494d1d68a31fb8433dbf593f831dff2 (patch) | |
| tree | 9acd7f0e2279bd971b5ccd1f1eb8cec8b7937003 /tests/common.sh.in | |
| parent | 502d94048ae848eda1fcda2d1e72b339eaa653aa (diff) | |
| parent | 63227d434cefaa9faeb14afe28ebeb9b2d449ee2 (diff) | |
* Sync with the trunk.
Diffstat (limited to 'tests/common.sh.in')
| -rw-r--r-- | tests/common.sh.in | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tests/common.sh.in b/tests/common.sh.in index 4ab490a62645..7504dc059e56 100644 --- a/tests/common.sh.in +++ b/tests/common.sh.in @@ -9,7 +9,6 @@ if ! NIX_STORE_DIR=$(readlink -f $TEST_ROOT/store 2> /dev/null); then export NIX_IGNORE_SYMLINK_STORE=1 NIX_STORE_DIR=$TEST_ROOT/store fi -export NIX_DATA_DIR=$TEST_ROOT/data export NIX_LOCALSTATE_DIR=$TEST_ROOT/var export NIX_LOG_DIR=$TEST_ROOT/var/log/nix export NIX_STATE_DIR=$TEST_ROOT/var/nix @@ -19,15 +18,11 @@ export NIX_BIN_DIR=$TEST_ROOT/bin export NIX_LIBEXEC_DIR=$TEST_ROOT/bin export NIX_MANIFESTS_DIR=$TEST_ROOT/var/nix/manifests export NIX_ROOT_FINDER= +export NIX_PATH=nix=$TOP/corepkgs export SHARED=$TEST_ROOT/shared export PATH=$NIX_BIN_DIR:$TOP/scripts:$PATH -export REAL_BIN_DIR=@bindir@ -export REAL_LIBEXEC_DIR=@libexecdir@ -export REAL_LOCALSTATE_DIR=@localstatedir@ -export REAL_DATA_DIR=@datadir@ -export REAL_STORE_DIR=@storedir@ export NIX_BUILD_HOOK= export PERL=perl export PERL5LIB=$TOP/perl/lib:$PERL5LIB |