diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-01T15·41+0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-01T15·41+0100 |
| commit | 2f9bb5c7e744ddca3fbe5576e520a3e80c106c55 (patch) | |
| tree | 7a3d5d57a460aa87a8f8b58d46102ca339e97770 /tests/common.sh.in | |
| parent | c5ba08133370f98de722c978bda3b446721985de (diff) | |
| parent | 6dca72006aa9b1cf2f226bb5b538e744fcab976f (diff) | |
Merge branch 'make'
Diffstat (limited to 'tests/common.sh.in')
| -rw-r--r-- | tests/common.sh.in | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/common.sh.in b/tests/common.sh.in index 2ae34603fcb5..0c4df7119204 100644 --- a/tests/common.sh.in +++ b/tests/common.sh.in @@ -1,7 +1,6 @@ set -e datadir="@datadir@" -profiledir="@profiledir@" export TEST_ROOT=$(pwd)/test-tmp export NIX_STORE_DIR @@ -16,7 +15,7 @@ export NIX_STATE_DIR=$TEST_ROOT/var/nix export NIX_DB_DIR=$TEST_ROOT/db export NIX_CONF_DIR=$TEST_ROOT/etc export NIX_MANIFESTS_DIR=$TEST_ROOT/var/nix/manifests -export SHARED=$TEST_ROOT/shared +export _NIX_TEST_SHARED=$TEST_ROOT/shared export NIX_REMOTE=$NIX_REMOTE_ export PATH=@bindir@:$PATH @@ -24,11 +23,10 @@ export PATH=@bindir@:$PATH export NIX_BUILD_HOOK= export dot=@dot@ export xmllint="@xmllint@" -export xmlflags="@xmlflags@" export xsltproc="@xsltproc@" -export SHELL="@shell@" +export SHELL="@bash@" -export version=@version@ +export version=@PACKAGE_VERSION@ export system=@system@ readLink() { |