Skip to content

Commit ea699b4

Browse files
szedergitster
authored andcommitted
t5310-pack-bitmaps: skip JGit tests with SHA256
In 't5310-pack-bitmaps.sh' two tests make sure that our pack bitmaps are compatible with JGit's bitmaps. Alas, not even the most recent JGit version (5.9.0.202009080501-r) supports SHA256 yet, so when this test script is run with GIT_TEST_DEFAULT_HASH=sha256 on a setup with JGit installed in PATH, then these two tests fail. Protect these two tests with the SHA1 prereq in order to skip them when testing with SHA256. Signed-off-by: SZEDER Gábor <[email protected]> Reviewed-by: Taylor Blau <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 898f807 commit ea699b4

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

t/t5310-pack-bitmaps.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ test_expect_success 'pack with missing parent' '
277277
git pack-objects --stdout --revs <revs >/dev/null
278278
'
279279

280-
test_expect_success JGIT 'we can read jgit bitmaps' '
280+
test_expect_success JGIT,SHA1 'we can read jgit bitmaps' '
281281
git clone --bare . compat-jgit.git &&
282282
(
283283
cd compat-jgit.git &&
@@ -287,7 +287,7 @@ test_expect_success JGIT 'we can read jgit bitmaps' '
287287
)
288288
'
289289

290-
test_expect_success JGIT 'jgit can read our bitmaps' '
290+
test_expect_success JGIT,SHA1 'jgit can read our bitmaps' '
291291
git clone --bare . compat-us.git &&
292292
(
293293
cd compat-us.git &&

0 commit comments

Comments
 (0)