From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: <git@vger.kernel.org>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: [PATCH 27/38] t5308: make test work with SHA-256
Date: Fri, 10 Jul 2020 02:47:17 +0000 [thread overview]
Message-ID: <20200710024728.3100527-28-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <20200710024728.3100527-1-sandals@crustytoothpaste.net>
This test needs multiple object IDs that have the same first byte.
Update the pack test code to generate a suitable packed value for
SHA-256. Update the test to use this value when using SHA-256.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
t/lib-pack.sh | 8 ++++++++
t/t5308-pack-detect-duplicates.sh | 20 ++++++++++++--------
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/t/lib-pack.sh b/t/lib-pack.sh
index f3463170b3..0c799d53c6 100644
--- a/t/lib-pack.sh
+++ b/t/lib-pack.sh
@@ -93,6 +93,14 @@ pack_obj () {
;;
esac
;;
+ # blob containing "\3\326"
+ 471819e8c52bf11513f100b2810a8aa0622d5cd3d1c913758a071dd4b3bad8fe)
+ case "$2" in
+ '')
+ printf '\062\170\234\143\276\006\000\000\336\000\332'
+ return
+ ;;
+ esac
esac
# If it's not a delta, we can convince pack-objects to generate a pack
diff --git a/t/t5308-pack-detect-duplicates.sh b/t/t5308-pack-detect-duplicates.sh
index 6845c1f3c3..693b2411c8 100755
--- a/t/t5308-pack-detect-duplicates.sh
+++ b/t/t5308-pack-detect-duplicates.sh
@@ -4,23 +4,27 @@ test_description='handling of duplicate objects in incoming packfiles'
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-pack.sh
-if ! test_have_prereq SHA1
-then
- skip_all='not using SHA-1 for objects'
- test_done
-fi
+test_expect_success 'setup' '
+ test_oid_cache <<-EOF
+ lo_oid sha1:e68fe8129b546b101aee9510c5328e7f21ca1d18
+ lo_oid sha256:471819e8c52bf11513f100b2810a8aa0622d5cd3d1c913758a071dd4b3bad8fe
+
+ missing_oid sha1:e69d000000000000000000000000000000000000
+ missing_oid sha256:4720000000000000000000000000000000000000000000000000000000000000
+ EOF
+'
# The sha1s we have in our pack. It's important that these have the same
# starting byte, so that they end up in the same fanout section of the index.
# That lets us make sure we are exercising the binary search with both sets.
-LO_SHA1=e68fe8129b546b101aee9510c5328e7f21ca1d18
-HI_SHA1=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+LO_SHA1=$(test_oid lo_oid)
+HI_SHA1=$EMPTY_BLOB
# And here's a "missing sha1" which will produce failed lookups. It must also
# be in the same fanout section, and should be between the two (so that during
# our binary search, we are sure to end up looking at one or the other of the
# duplicate runs).
-MISSING_SHA1='e69d000000000000000000000000000000000000'
+MISSING_SHA1=$(test_oid missing_oid)
# git will never intentionally create packfiles with
# duplicate objects, so we have to construct them by hand.
next prev parent reply other threads:[~2020-07-10 2:48 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-10 2:46 [PATCH 00/38] SHA-256, part 3/3 brian m. carlson
2020-07-10 2:46 ` [PATCH 01/38] t: make test-bloom initialize repository brian m. carlson
2020-07-10 2:46 ` [PATCH 02/38] t1001: use $ZERO_OID brian m. carlson
2020-07-10 2:46 ` [PATCH 03/38] t3305: make hash agnostic brian m. carlson
2020-07-10 2:46 ` [PATCH 04/38] t3404: prepare 'short SHA-1 collision' tests for SHA-256 brian m. carlson
2020-07-10 2:46 ` [PATCH 05/38] t6100: make hash size independent brian m. carlson
2020-07-10 2:46 ` [PATCH 06/38] t6101: " brian m. carlson
2020-07-10 2:46 ` [PATCH 07/38] t6301: " brian m. carlson
2020-07-10 2:46 ` [PATCH 08/38] t6500: specify test values for SHA-256 brian m. carlson
2020-07-10 2:46 ` [PATCH 09/38] t6501: avoid hard-coded objects brian m. carlson
2020-07-10 2:47 ` [PATCH 10/38] t7003: compute appropriate length constant brian m. carlson
2020-07-10 2:47 ` [PATCH 11/38] t7063: make hash size independent brian m. carlson
2020-07-11 0:43 ` Junio C Hamano
2020-07-11 0:54 ` brian m. carlson
2020-07-10 2:47 ` [PATCH 12/38] t7201: abstract away SHA-1-specific constants brian m. carlson
2020-07-10 2:47 ` [PATCH 13/38] t7102: " brian m. carlson
2020-07-10 2:47 ` [PATCH 14/38] t7400: make hash size independent brian m. carlson
2020-07-10 2:47 ` [PATCH 15/38] t7405: " brian m. carlson
2020-07-10 2:47 ` [PATCH 16/38] t7506: avoid checking for SHA-1-specific constants brian m. carlson
2020-07-10 2:47 ` [PATCH 17/38] t7508: use $ZERO_OID instead of hard-coded constant brian m. carlson
2020-07-10 2:47 ` [PATCH 18/38] t8002: make hash size independent brian m. carlson
2020-07-10 2:47 ` [PATCH 19/38] t8003: " brian m. carlson
2020-07-10 2:47 ` [PATCH 20/38] t8011: " brian m. carlson
2020-07-10 2:47 ` [PATCH 21/38] t9300: abstract away SHA-1-specific constants brian m. carlson
2020-07-10 2:47 ` [PATCH 22/38] t9300: use $ZERO_OID instead of hard-coded object ID brian m. carlson
2020-07-10 2:47 ` [PATCH 23/38] t9301: make hash size independent brian m. carlson
2020-07-10 2:47 ` [PATCH 24/38] t9350: " brian m. carlson
2020-07-10 2:47 ` [PATCH 25/38] t9500: ensure that algorithm info is preserved in config brian m. carlson
2020-07-10 2:47 ` [PATCH 26/38] t9700: make hash size independent brian m. carlson
2020-07-10 2:47 ` brian m. carlson [this message]
2020-07-10 2:47 ` [PATCH 28/38] t0410: mark test with SHA1 prerequisite brian m. carlson
2020-07-10 2:47 ` [PATCH 29/38] http-fetch: set up git directory before parsing pack hashes brian m. carlson
2020-07-10 2:47 ` [PATCH 30/38] builtin/verify-pack: implement an --object-format option brian m. carlson
2020-07-10 2:47 ` [PATCH 31/38] setup: add support for reading extensions.objectformat brian m. carlson
2020-07-10 2:47 ` [PATCH 32/38] Enable SHA-256 support by default brian m. carlson
2020-07-10 2:47 ` [PATCH 33/38] t: add test_oid option to select hash algorithm brian m. carlson
2020-07-10 2:47 ` [PATCH 34/38] t: allow testing different hash algorithms via environment brian m. carlson
2020-07-10 2:47 ` [PATCH 35/38] t: make SHA1 prerequisite depend on default hash brian m. carlson
2020-07-12 2:13 ` Denton Liu
2020-07-12 17:34 ` Junio C Hamano
2020-07-10 2:47 ` [PATCH 36/38] ci: run tests with SHA-256 brian m. carlson
2020-07-10 15:09 ` Derrick Stolee
2020-07-10 2:47 ` [PATCH 37/38] docs: add documentation for extensions.objectFormat brian m. carlson
2020-07-10 20:21 ` Martin Ågren
2020-07-10 2:47 ` [PATCH 38/38] t: remove test_oid_init in tests brian m. carlson
2020-07-10 15:14 ` [PATCH 00/38] SHA-256, part 3/3 Derrick Stolee
2020-07-10 19:55 ` brian m. carlson
2020-07-10 20:15 ` Junio C Hamano
2020-07-11 0:37 ` Junio C Hamano
2020-07-11 1:06 ` brian m. carlson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200710024728.3100527-28-sandals@crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).