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/fixed.sh | |
| parent | cd6d02c366af43bccdd2ef345193e4fdeca78a13 (diff) | |
* Refactoring: remove unnecessary variables from the tests.
Diffstat (limited to 'tests/fixed.sh')
| -rw-r--r-- | tests/fixed.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/fixed.sh b/tests/fixed.sh index 91c122083035..164791564b9a 100644 --- a/tests/fixed.sh +++ b/tests/fixed.sh @@ -6,31 +6,31 @@ export IMPURE_VAR1=foo export IMPURE_VAR2=bar echo 'testing good...' -$nixbuild fixed.nix -A good +nix-build fixed.nix -A good echo 'testing good2...' -$nixbuild fixed.nix -A good2 +nix-build fixed.nix -A good2 echo 'testing bad...' -$nixbuild fixed.nix -A bad && fail "should fail" +nix-build fixed.nix -A bad && fail "should fail" echo 'testing reallyBad...' -$nixinstantiate fixed.nix -A reallyBad && fail "should fail" +nix-instantiate fixed.nix -A reallyBad && fail "should fail" # While we're at it, check attribute selection a bit more. echo 'testing attribute selection...' -test $($nixinstantiate fixed.nix -A good.1 | wc -l) = 1 +test $(nix-instantiate fixed.nix -A good.1 | wc -l) = 1 # Test parallel builds of derivations that produce the same output. # Only one should run at the same time. echo 'testing parallelSame...' clearStore -$nixbuild fixed.nix -A parallelSame -j2 +nix-build fixed.nix -A parallelSame -j2 # Fixed-output derivations with a recursive SHA-256 hash should # produce the same path as "nix-store --add". echo 'testing sameAsAdd...' -out=$($nixbuild fixed.nix -A sameAsAdd) +out=$(nix-build fixed.nix -A sameAsAdd) # This is what fixed.builder2 produces... rm -rf $TEST_ROOT/fixed @@ -39,14 +39,14 @@ mkdir $TEST_ROOT/fixed/bla echo "Hello World!" > $TEST_ROOT/fixed/foo ln -s foo $TEST_ROOT/fixed/bar -out2=$($nixstore --add $TEST_ROOT/fixed) +out2=$(nix-store --add $TEST_ROOT/fixed) echo $out2 test "$out" = "$out2" || exit 1 -out3=$($nixstore --add-fixed --recursive sha256 $TEST_ROOT/fixed) +out3=$(nix-store --add-fixed --recursive sha256 $TEST_ROOT/fixed) echo $out3 test "$out" = "$out3" || exit 1 -out4=$($nixstore --print-fixed-path --recursive sha256 "1ixr6yd3297ciyp9im522dfxpqbkhcw0pylkb2aab915278fqaik" fixed) +out4=$(nix-store --print-fixed-path --recursive sha256 "1ixr6yd3297ciyp9im522dfxpqbkhcw0pylkb2aab915278fqaik" fixed) echo $out4 test "$out" = "$out4" || exit 1 |