t5310-pack-bitmaps: skip JGit tests with SHA256

szeder · gitster · commit ea699b4adc6f · 2020-11-16T11:32:51.000-08:00
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 &lt;szeder.dev@gmail.com&gt;
Reviewed-by: Taylor Blau &lt;me@ttaylorr.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh
@@ -277,7 +277,7 @@ test_expect_success 'pack with missing parent' '
 	git pack-objects --stdout --revs <revs >/dev/null
 '
 
-test_expect_success JGIT 'we can read jgit bitmaps' '
+test_expect_success JGIT,SHA1 'we can read jgit bitmaps' '
 	git clone --bare . compat-jgit.git &&
 	(
 		cd compat-jgit.git &&
@@ -287,7 +287,7 @@ test_expect_success JGIT 'we can read jgit bitmaps' '
 	)
 '
 
-test_expect_success JGIT 'jgit can read our bitmaps' '
+test_expect_success JGIT,SHA1 'jgit can read our bitmaps' '
 	git clone --bare . compat-us.git &&
 	(
 		cd compat-us.git &&

Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@ test_expect_success 'pack with missing parent' '`
`277`	`277`	`git pack-objects --stdout --revs <revs >/dev/null`
`278`	`278`	`'`
`279`	`279`
`280`		`-test_expect_success JGIT 'we can read jgit bitmaps' '`
	`280`	`+test_expect_success JGIT,SHA1 'we can read jgit bitmaps' '`
`281`	`281`	`git clone --bare . compat-jgit.git &&`
`282`	`282`	`(`
`283`	`283`	`cd compat-jgit.git &&`
`@@ -287,7 +287,7 @@ test_expect_success JGIT 'we can read jgit bitmaps' '`
`287`	`287`	`)`
`288`	`288`	`'`
`289`	`289`
`290`		`-test_expect_success JGIT 'jgit can read our bitmaps' '`
	`290`	`+test_expect_success JGIT,SHA1 'jgit can read our bitmaps' '`
`291`	`291`	`git clone --bare . compat-us.git &&`
`292`	`292`	`(`
`293`	`293`	`cd compat-us.git &&`