diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2011-10-10T21·32+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2011-10-10T21·32+0000 |
| commit | 8af7d766f0244d5b15d89ab2d2d66b0d63e8f576 (patch) | |
| tree | 3346cb494de0bf35403d812efd8b757595cd44d6 /tests/gc.sh | |
| parent | cd6d02c366af43bccdd2ef345193e4fdeca78a13 (diff) | |
* Refactoring: remove unnecessary variables from the tests.
Diffstat (limited to 'tests/gc.sh')
| -rw-r--r-- | tests/gc.sh | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/gc.sh b/tests/gc.sh index e1b3a08204..a375a35c2e 100644 --- a/tests/gc.sh +++ b/tests/gc.sh @@ -1,27 +1,27 @@ source common.sh -drvPath=$($nixinstantiate dependencies.nix) -outPath=$($nixstore -rvv "$drvPath") +drvPath=$(nix-instantiate dependencies.nix) +outPath=$(nix-store -rvv "$drvPath") # Set a GC root. rm -f "$NIX_STATE_DIR"/gcroots/foo ln -sf $outPath "$NIX_STATE_DIR"/gcroots/foo -$nixstore --gc --print-roots | grep $outPath -$nixstore --gc --print-live | grep $outPath -$nixstore --gc --print-dead | grep $drvPath -if $nixstore --gc --print-dead | grep $outPath; then false; fi +nix-store --gc --print-roots | grep $outPath +nix-store --gc --print-live | grep $outPath +nix-store --gc --print-dead | grep $drvPath +if nix-store --gc --print-dead | grep $outPath; then false; fi -$nixstore --gc --print-dead +nix-store --gc --print-dead inUse=$(readLink $outPath/input-2) -if $nixstore --delete $inUse; then false; fi +if nix-store --delete $inUse; then false; fi test -e $inUse -if $nixstore --delete $outPath; then false; fi +if nix-store --delete $outPath; then false; fi test -e $outPath -$NIX_BIN_DIR/nix-collect-garbage +nix-collect-garbage # Check that the root and its dependencies haven't been deleted. cat $outPath/foobar @@ -32,7 +32,7 @@ if test -e $drvPath; then false; fi rm "$NIX_STATE_DIR"/gcroots/foo -$NIX_BIN_DIR/nix-collect-garbage +nix-collect-garbage # Check that the output has been GC'd. if test -e $outPath/foobar; then false; fi |