diff options
Diffstat (limited to 'tests/gc-concurrent.sh')
| -rw-r--r-- | tests/gc-concurrent.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/gc-concurrent.sh b/tests/gc-concurrent.sh index 74251d7cb..0bc5a12d3 100644 --- a/tests/gc-concurrent.sh +++ b/tests/gc-concurrent.sh @@ -2,14 +2,14 @@ source common.sh clearStore -drvPath1=$($nixinstantiate gc-concurrent.nix -A test1) -outPath1=$($nixstore -q $drvPath1) +drvPath1=$(nix-instantiate gc-concurrent.nix -A test1) +outPath1=$(nix-store -q $drvPath1) -drvPath2=$($nixinstantiate gc-concurrent.nix -A test2) -outPath2=$($nixstore -q $drvPath2) +drvPath2=$(nix-instantiate gc-concurrent.nix -A test2) +outPath2=$(nix-store -q $drvPath2) -drvPath3=$($nixinstantiate simple.nix) -outPath3=$($nixstore -r $drvPath3) +drvPath3=$(nix-instantiate simple.nix) +outPath3=$(nix-store -r $drvPath3) ! test -e $outPath3.lock touch $outPath3.lock @@ -19,16 +19,16 @@ ln -s $drvPath2 "$NIX_STATE_DIR"/gcroots/foo ln -s $outPath3 "$NIX_STATE_DIR"/gcroots/foo2 # Start build #1 in the background. It starts immediately. -$nixstore -rvv "$drvPath1" & +nix-store -rvv "$drvPath1" & pid1=$! # Start build #2 in the background after 10 seconds. -(sleep 10 && $nixstore -rvv "$drvPath2") & +(sleep 10 && nix-store -rvv "$drvPath2") & pid2=$! # Run the garbage collector while the build is running. sleep 6 -$NIX_BIN_DIR/nix-collect-garbage +nix-collect-garbage # Wait for build #1/#2 to finish. echo waiting for pid $pid1 to finish... @@ -53,6 +53,6 @@ rm -f "$NIX_STATE_DIR"/gcroots/foo* ! test -e $outPath3.lock # If we run the collector now, it should delete outPath1/2. -$NIX_BIN_DIR/nix-collect-garbage +nix-collect-garbage ! test -e $outPath1 ! test -e $outPath2 |