diff options
author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-12-05T17·36+0000 |
---|---|---|
committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-12-05T17·36+0000 |
commit | f42a505ab71ba421797ac511e1221ccbefef8ab9 (patch) | |
tree | d76219e0889646dadab5ab3958f34751f91eedd7 /tests/binary-patching.sh | |
parent | 77f7a6d591e32a4a475552f3e67e3e67b7f71a10 (diff) |
* Add a script `nix-generate-patches'.
* Fix the binary patching test.
Diffstat (limited to 'tests/binary-patching.sh')
-rw-r--r-- | tests/binary-patching.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/binary-patching.sh b/tests/binary-patching.sh index c320dccc7901..60e57b4b00dc 100644 --- a/tests/binary-patching.sh +++ b/tests/binary-patching.sh @@ -19,10 +19,10 @@ $NIX_BIN_DIR/nix-push --copy $TEST_ROOT/cache2 $TEST_ROOT/manifest3 $out3 rm $RESULT # Generate binary patches. -$NIX_BIN_DIR/generate-patches.pl $TEST_ROOT/cache2 $TEST_ROOT/patches \ +$NIX_BIN_DIR/nix-generate-patches $TEST_ROOT/cache2 $TEST_ROOT/patches \ file://$TEST_ROOT/patches $TEST_ROOT/manifest1 $TEST_ROOT/manifest2 -$NIX_BIN_DIR/generate-patches.pl $TEST_ROOT/cache2 $TEST_ROOT/patches \ +$NIX_BIN_DIR/nix-generate-patches $TEST_ROOT/cache2 $TEST_ROOT/patches \ file://$TEST_ROOT/patches $TEST_ROOT/manifest2 $TEST_ROOT/manifest3 grep -q "patch {" $TEST_ROOT/manifest3 @@ -45,7 +45,7 @@ rm $RESULT [ "$(grep ' patch ' $TEST_ROOT/var/log/nix/downloads | wc -l)" -eq 2 ] # Add a patch from version 1 directly to version 3. -$NIX_BIN_DIR/generate-patches.pl $TEST_ROOT/cache2 $TEST_ROOT/patches \ +$NIX_BIN_DIR/nix-generate-patches $TEST_ROOT/cache2 $TEST_ROOT/patches \ file://$TEST_ROOT/patches $TEST_ROOT/manifest1 $TEST_ROOT/manifest3 # Rebuild version 3. This should use the direct patch rather than the |