mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Removed the locking.sh test; it's redundant because of the extended

Browse source 
parallel.sh test.  Also, don't call multiple nix-builds in parallel,
  since they can race creating .nix-build-tmp-derivation.
This commit is contained in:
Eelco Dolstra 2009-03-25 16:43:38 +00:00
parent 8146a0c731
commit 7024a1ef07
5 changed files with 11 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tests/Makefile.am
View file

@ -3,7 +3,7 @@ TESTS_ENVIRONMENT = $(bash) -e
extra1 = $(shell pwd)/test-tmp/shared extra1 = $(shell pwd)/test-tmp/shared
TESTS = init.sh hash.sh lang.sh add.sh simple.sh dependencies.sh \ TESTS = init.sh hash.sh lang.sh add.sh simple.sh dependencies.sh \
locking.sh parallel.sh build-hook.sh substitutes.sh substitutes2.sh \ parallel.sh build-hook.sh substitutes.sh substitutes2.sh \
fallback.sh nix-push.sh gc.sh gc-concurrent.sh verify.sh nix-pull.sh \ fallback.sh nix-push.sh gc.sh gc-concurrent.sh verify.sh nix-pull.sh \
referrers.sh user-envs.sh logging.sh nix-build.sh misc.sh fixed.sh \ referrers.sh user-envs.sh logging.sh nix-build.sh misc.sh fixed.sh \
gc-runtime.sh install-package.sh check-refs.sh filter-source.sh \ gc-runtime.sh install-package.sh check-refs.sh filter-source.sh \
@ -20,7 +20,6 @@ EXTRA_DIST = $(TESTS) \
simple.nix simple.builder.sh \ simple.nix simple.builder.sh \
hash-check.nix \ hash-check.nix \
dependencies.nix dependencies.builder*.sh \ dependencies.nix dependencies.builder*.sh \
locking.nix locking.builder.sh \
parallel.nix parallel.builder.sh \ parallel.nix parallel.builder.sh \
build-hook.nix build-hook.hook.sh \ build-hook.nix build-hook.hook.sh \
substituter.sh substituter2.sh \ substituter.sh substituter2.sh \

6
tests/locking.builder.sh
View file

@ -1,6 +0,0 @@
sleep 3
# Use `>>'; without proper locking this will cause text duplication.
echo -n $(cat $inputs)$text >> $out
sleep 2

17
tests/locking.nix
View file

@ -1,17 +0,0 @@
with import ./config.nix;
let
mkDrv = text: inputs: mkDerivation {
name = "locking";
builder = ./locking.builder.sh;
inherit text inputs;
};
a = mkDrv "a" [];
b = mkDrv "b" [a];
c = mkDrv "c" [a b];
d = mkDrv "d" [a];
e = mkDrv "e" [c d];
in e

19
tests/locking.sh
View file

@ -1,19 +0,0 @@
source common.sh
drvPath=$($nixinstantiate locking.nix)
echo "derivation is $drvPath"
for i in 1 2 3 4 5; do
echo "WORKER $i"
$nixstore -rvv "$drvPath" &
done
sleep 5
outPath=$($nixstore -qvvf "$drvPath")
echo "output path is $outPath"
text=$(cat "$outPath")
if test "$text" != "aabcade"; then exit 1; fi

11
tests/parallel.sh
View file

@ -1,5 +1,6 @@
source common.sh source common.sh
# First, test that -jN performs builds in parallel. # First, test that -jN performs builds in parallel.
echo "testing nix-build -j..." echo "testing nix-build -j..."
@ -17,6 +18,7 @@ if test "$text" != "abacade"; then exit 1; fi
if test "$(cat $SHARED.cur)" != 0; then fail "wrong current process count"; fi if test "$(cat $SHARED.cur)" != 0; then fail "wrong current process count"; fi
if test "$(cat $SHARED.max)" != 3; then fail "not enough parallelism"; fi if test "$(cat $SHARED.max)" != 3; then fail "not enough parallelism"; fi
# Second, test that parallel invocations of nix-build perform builds # Second, test that parallel invocations of nix-build perform builds
# in parallel, and don't block waiting on locks held by the others. # in parallel, and don't block waiting on locks held by the others.
echo "testing multiple nix-build -j1..." echo "testing multiple nix-build -j1..."
@ -25,7 +27,9 @@ clearStore
rm -f $SHARED.cur $SHARED.max rm -f $SHARED.cur $SHARED.max
cmd="$nixbuild -j1 parallel.nix --argstr sleepTime 7" drvPath=$($nixinstantiate parallel.nix --argstr sleepTime 7)
cmd="$nixstore -j1 -r $drvPath"
$cmd & $cmd &
pid1=$! pid1=$!
@ -39,9 +43,14 @@ $cmd &
pid3=$! pid3=$!
echo "pid 3 is $pid3" echo "pid 3 is $pid3"
$cmd &
pid4=$!
echo "pid 4 is $pid4"
wait $pid1 || fail "instance 1 failed: $?" wait $pid1 || fail "instance 1 failed: $?"
wait $pid2 || fail "instance 2 failed: $?" wait $pid2 || fail "instance 2 failed: $?"
wait $pid3 || fail "instance 3 failed: $?" wait $pid3 || fail "instance 3 failed: $?"
wait $pid4 || fail "instance 4 failed: $?"
if test "$(cat $SHARED.cur)" != 0; then fail "wrong current process count"; fi if test "$(cat $SHARED.cur)" != 0; then fail "wrong current process count"; fi
if test "$(cat $SHARED.max)" != 3; then fail "not enough parallelism"; fi if test "$(cat $SHARED.max)" != 3; then fail "not enough parallelism"; fi