diff options
Diffstat (limited to 'tests/binary-patching.sh')
| -rw-r--r-- | tests/binary-patching.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/binary-patching.sh b/tests/binary-patching.sh index 9866f4f6f2..8c52c2f142 100644 --- a/tests/binary-patching.sh +++ b/tests/binary-patching.sh @@ -8,12 +8,12 @@ RESULT=$TEST_ROOT/result # Build version 1 and 2 of the "foo" package. nix-push --copy $TEST_ROOT/cache2 $TEST_ROOT/manifest1 \ - $($nixbuild -o $RESULT binary-patching.nix --arg version 1) + $(nix-build -o $RESULT binary-patching.nix --arg version 1) -out2=$($nixbuild -o $RESULT binary-patching.nix --arg version 2) +out2=$(nix-build -o $RESULT binary-patching.nix --arg version 2) nix-push --copy $TEST_ROOT/cache2 $TEST_ROOT/manifest2 $out2 -out3=$($nixbuild -o $RESULT binary-patching.nix --arg version 3) +out3=$(nix-build -o $RESULT binary-patching.nix --arg version 3) nix-push --copy $TEST_ROOT/cache2 $TEST_ROOT/manifest3 $out3 rm $RESULT @@ -28,19 +28,19 @@ nix-generate-patches $TEST_ROOT/cache2 $TEST_ROOT/patches \ grep -q "patch {" $TEST_ROOT/manifest3 # Get rid of versions 2 and 3. -$nixstore --delete $out2 $out3 +nix-store --delete $out2 $out3 # Pull the manifest containing the patches. clearManifests -$NIX_BIN_DIR/nix-pull file://$TEST_ROOT/manifest3 +nix-pull file://$TEST_ROOT/manifest3 # Make sure that the download size prediction uses the patches rather # than the full download. -$nixbuild -o $RESULT binary-patching.nix --arg version 3 --dry-run 2>&1 | grep -q "0.01 MiB" +nix-build -o $RESULT binary-patching.nix --arg version 3 --dry-run 2>&1 | grep -q "0.01 MiB" # Now rebuild it. This should use the two patches generated above. rm -f $TEST_ROOT/var/log/nix/downloads -$nixbuild -o $RESULT binary-patching.nix --arg version 3 +nix-build -o $RESULT binary-patching.nix --arg version 3 rm $RESULT [ "$(grep ' patch ' $TEST_ROOT/var/log/nix/downloads | wc -l)" -eq 2 ] @@ -50,9 +50,9 @@ nix-generate-patches $TEST_ROOT/cache2 $TEST_ROOT/patches \ # Rebuild version 3. This should use the direct patch rather than the # sequence of two patches. -$nixstore --delete $out2 $out3 +nix-store --delete $out2 $out3 clearManifests rm $TEST_ROOT/var/log/nix/downloads -$NIX_BIN_DIR/nix-pull file://$TEST_ROOT/manifest3 -$nixbuild -o $RESULT binary-patching.nix --arg version 3 +nix-pull file://$TEST_ROOT/manifest3 +nix-build -o $RESULT binary-patching.nix --arg version 3 [ "$(grep ' patch ' $TEST_ROOT/var/log/nix/downloads | wc -l)" -eq 1 ] |