diff options
| author | Nicolas Pitre <nico@cam.org> | 2007-11-15 12:24:17 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-15 21:18:07 -0800 |
| commit | 5f9ffff308845e2439670ec3cb2c12f4865cf430 (patch) | |
| tree | 9eb13cdb9ef6daff7e79f297ce2f4b8dcd6a53d0 /t/t5302-pack-index.sh | |
| parent | 7f0e39faa2929541f61039be96d3f40f74207585 (diff) | |
| download | git-5f9ffff308845e2439670ec3cb2c12f4865cf430.tar.gz git-5f9ffff308845e2439670ec3cb2c12f4865cf430.tar.xz | |
rehabilitate some t5302 tests on 32-bit off_t machines
Commit 8ed2fca458d085f12c3c6808ef4ddab6aa40ef14 was a bit draconian in
skipping certain tests which should be perfectly valid even on platform
with a 32-bit off_t.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5302-pack-index.sh')
| -rwxr-xr-x | t/t5302-pack-index.sh | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/t/t5302-pack-index.sh b/t/t5302-pack-index.sh index d93abc4c7..2a2878b57 100755 --- a/t/t5302-pack-index.sh +++ b/t/t5302-pack-index.sh @@ -129,17 +129,15 @@ test_expect_failure \ '[index v1] 6) newly created pack is BAD !' \ 'git verify-pack -v "test-4-${pack1}.pack"' -test "$have_64bits" && test_expect_success \ '[index v2] 1) stream pack to repository' \ 'rm -f .git/objects/pack/* && - git-index-pack --index-version=2,0x40000 --stdin < "test-1-${pack1}.pack" && + git-index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" && git prune-packed && git count-objects | ( read nr rest && test "$nr" -eq 1 ) && cmp "test-1-${pack1}.pack" ".git/objects/pack/pack-${pack1}.pack" && - cmp "test-3-${pack1}.idx" ".git/objects/pack/pack-${pack1}.idx"' + cmp "test-2-${pack1}.idx" ".git/objects/pack/pack-${pack1}.idx"' -test "$have_64bits" && test_expect_success \ '[index v2] 2) create a stealth corruption in a delta base reference' \ '# this test assumes a delta smaller than 16 bytes at the end of the pack @@ -152,17 +150,14 @@ test_expect_success \ bs=1 count=20 conv=notrunc && git cat-file blob "$delta_sha1" > blob_4 )' -test "$have_64bits" && test_expect_failure \ '[index v2] 3) corrupted delta happily returned wrong data' \ 'cmp blob_3 blob_4' -test "$have_64bits" && test_expect_failure \ '[index v2] 4) confirm that the pack is actually corrupted' \ 'git fsck --full $commit' -test "$have_64bits" && test_expect_failure \ '[index v2] 5) pack-objects refuses to reuse corrupted data' \ 'git pack-objects test-5 <obj-list' |