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/dependencies.sh | |
parent | cd6d02c366af43bccdd2ef345193e4fdeca78a13 (diff) |
* Refactoring: remove unnecessary variables from the tests.
Diffstat (limited to 'tests/dependencies.sh')
-rw-r--r-- | tests/dependencies.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/dependencies.sh b/tests/dependencies.sh index 46f60c9bd334..df204d185ddc 100644 --- a/tests/dependencies.sh +++ b/tests/dependencies.sh @@ -2,36 +2,36 @@ source common.sh clearStore -drvPath=$($nixinstantiate dependencies.nix) +drvPath=$(nix-instantiate dependencies.nix) echo "derivation is $drvPath" -$nixstore -q --tree "$drvPath" | grep ' +---.*builder1.sh' +nix-store -q --tree "$drvPath" | grep ' +---.*builder1.sh' # Test Graphviz graph generation. -$nixstore -q --graph "$drvPath" > $TEST_ROOT/graph +nix-store -q --graph "$drvPath" > $TEST_ROOT/graph if test -n "$dot"; then # Does it parse? $dot < $TEST_ROOT/graph fi -outPath=$($nixstore -rvv "$drvPath") || fail "build failed" +outPath=$(nix-store -rvv "$drvPath") || fail "build failed" # Test Graphviz graph generation. -$nixstore -q --graph "$outPath" > $TEST_ROOT/graph +nix-store -q --graph "$outPath" > $TEST_ROOT/graph if test -n "$dot"; then # Does it parse? $dot < $TEST_ROOT/graph fi -$nixstore -q --tree "$outPath" | grep '+---.*dependencies-input-2' +nix-store -q --tree "$outPath" | grep '+---.*dependencies-input-2' echo "output path is $outPath" text=$(cat "$outPath"/foobar) if test "$text" != "FOOBAR"; then exit 1; fi -deps=$($nixstore -quR "$drvPath") +deps=$(nix-store -quR "$drvPath") echo "output closure contains $deps" @@ -45,8 +45,8 @@ if echo "$deps" | grep -q "dependencies-input-1"; then exit 1; fi input2OutPath=$(echo "$deps" | grep "dependencies-input-2") # The referrers closure of input-2 should include outPath. -$nixstore -q --referrers-closure "$input2OutPath" | grep "$outPath" +nix-store -q --referrers-closure "$input2OutPath" | grep "$outPath" # Check that the derivers are set properly. -test $($nixstore -q --deriver "$outPath") = "$drvPath" -$nixstore -q --deriver "$input2OutPath" | grep -q -- "-input-2.drv" +test $(nix-store -q --deriver "$outPath") = "$drvPath" +nix-store -q --deriver "$input2OutPath" | grep -q -- "-input-2.drv" |