Skip to content

Commit

Permalink
rehabilitate some t5302 tests on 32-bit off_t machines
Browse files Browse the repository at this point in the history
Commit 8ed2fca 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>
  • Loading branch information
Nicolas Pitre authored and Junio C Hamano committed Nov 16, 2007
1 parent 7f0e39f commit 5f9ffff
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions t/t5302-pack-index.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'
Expand Down

0 comments on commit 5f9ffff

Please sign in to comment.