maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use shorter daemon socket path in tests

Browse source 
Otherwise we hit the 104 character limit.

http://hydra.nixos.org/build/33562028
This commit is contained in:
Eelco Dolstra 2016-03-24 14:38:31 +01:00
parent 374198ad6d
commit 3b81b26457
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/common.sh.in
View file

@ -2,7 +2,7 @@ set -e
datadir="@datadir@" datadir="@datadir@"
export TEST_ROOT=$(pwd)/test-tmp export TEST_ROOT=${TMPDIR:-/tmp}/nix-test
export NIX_STORE_DIR export NIX_STORE_DIR
if ! NIX_STORE_DIR=$(readlink -f $TEST_ROOT/store 2> /dev/null); then if ! NIX_STORE_DIR=$(readlink -f $TEST_ROOT/store 2> /dev/null); then
# Maybe the build directory is symlinked. # Maybe the build directory is symlinked.

2
tests/filter-source.nix
View file

@ -8,5 +8,5 @@ mkDerivation {
type != "symlink" type != "symlink"
&& baseNameOf path != "foo" && baseNameOf path != "foo"
&& !((import ./lang/lib.nix).hasSuffix ".bak" (baseNameOf path)); && !((import ./lang/lib.nix).hasSuffix ".bak" (baseNameOf path));
in builtins.filterSource filter ./test-tmp/filterin; in builtins.filterSource filter ((builtins.getEnv "TEST_ROOT") + "/filterin");
} }

6
tests/tarball.sh
View file

@ -16,8 +16,8 @@ tarball=$TEST_ROOT/tarball.tar.xz
nix-env -f file://$tarball -qa --out-path | grep -q dependencies nix-env -f file://$tarball -qa --out-path | grep -q dependencies
nix-build file://$tarball nix-build -o $TMPDIR/result file://$tarball
nix-build '<foo>' -I foo=file://$tarball nix-build -o $TMPDIR/result '<foo>' -I foo=file://$tarball
nix-build -E "import (fetchTarball file://$tarball)" nix-build -o $TMPDIR/result -E "import (fetchTarball file://$tarball)"