t5319: make test work with SHA-256
This test corrupts various locations in a multi-pack index to test various error responses. However, these offsets differ between SHA-1 indexes and SHA-256 indexes due to differences in object length. Use test_oid to look up the correct offsets based on the algorithm. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
brian m. carlson committed
Dec 21, 2019 at 19:49 UTC
3c5e65cac15a7f3a52fc53babd079aeaddb47c20
1 file changed
+18
-4
t/t5319-multi-pack-index.sh
+18
-4
@@ -28,6 +28,20 @@ midx_read_expect () {
28
test_cmp expect actual
29
}
30
31
+test_expect_success 'setup' '
32
+ test_oid_init &&
33
+ test_oid_cache <<-EOF
34
+ idxoff sha1:2999
35
+ idxoff sha256:3739
36
+
37
+ packnameoff sha1:652
38
+ packnameoff sha256:940
39
+
40
+ fanoutoff sha1:1
41
+ fanoutoff sha256:3
42
+ EOF
43
+'
44
+
45
test_expect_success 'write midx with no packs' '
46
test_when_finished rm -f pack/multi-pack-index &&
47
git multi-pack-index --object-dir=. write &&
@@ -225,7 +239,7 @@ test_expect_success 'verify bad signature' '
239
"multi-pack-index signature"
240
'
241
228
-HASH_LEN=20
242
+HASH_LEN=$(test_oid rawsz)
243
NUM_OBJECTS=74
244
MIDX_BYTE_VERSION=4
245
MIDX_BYTE_OID_VERSION=5
@@ -238,9 +252,9 @@ MIDX_CHUNK_LOOKUP_WIDTH=12
252
MIDX_OFFSET_PACKNAMES=$(($MIDX_HEADER_SIZE + \
253
$MIDX_NUM_CHUNKS * $MIDX_CHUNK_LOOKUP_WIDTH))
254
MIDX_BYTE_PACKNAME_ORDER=$(($MIDX_OFFSET_PACKNAMES + 2))
241
-MIDX_OFFSET_OID_FANOUT=$(($MIDX_OFFSET_PACKNAMES + 652))
255
+MIDX_OFFSET_OID_FANOUT=$(($MIDX_OFFSET_PACKNAMES + $(test_oid packnameoff)))
256
MIDX_OID_FANOUT_WIDTH=4
243
-MIDX_BYTE_OID_FANOUT_ORDER=$((MIDX_OFFSET_OID_FANOUT + 250 * $MIDX_OID_FANOUT_WIDTH + 1))
257
+MIDX_BYTE_OID_FANOUT_ORDER=$((MIDX_OFFSET_OID_FANOUT + 250 * $MIDX_OID_FANOUT_WIDTH + $(test_oid fanoutoff)))
258
MIDX_OFFSET_OID_LOOKUP=$(($MIDX_OFFSET_OID_FANOUT + 256 * $MIDX_OID_FANOUT_WIDTH))
259
MIDX_BYTE_OID_LOOKUP=$(($MIDX_OFFSET_OID_LOOKUP + 16 * $HASH_LEN))
260
MIDX_OFFSET_OBJECT_OFFSETS=$(($MIDX_OFFSET_OID_LOOKUP + $NUM_OBJECTS * $HASH_LEN))
@@ -387,7 +401,7 @@ test_expect_success 'force some 64-bit offsets with pack-objects' '
401
pack64=$(git pack-objects --index-version=2,0x40 objects64/pack/test-64 <obj-list) &&
402
idx64=objects64/pack/test-64-$pack64.idx &&
403
chmod u+w $idx64 &&
390
- corrupt_data $idx64 2999 "\02" &&
404
+ corrupt_data $idx64 $(test_oid idxoff) "\02" &&
405
midx64=$(git multi-pack-index --object-dir=objects64 write) &&
406
midx_read_expect 1 63 5 objects64 " large-offsets"
407
'