From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: Yiyuan guo <yguoaz@gmail.com>
Subject: [PATCH 2/5] t5300: check that we produced expected number of deltas
Date: Sat, 1 May 2021 10:03:25 -0400 [thread overview]
Message-ID: <YI1frTcgfGb6GA3N@coredump.intra.peff.net> (raw)
In-Reply-To: <YI1fbERSuS7Y3LKh@coredump.intra.peff.net>
We pack a set of objects both with and without --window=0, assuming that
the 0-length window will cause us not to produce any deltas. Let's
confirm that this is the case.
Signed-off-by: Jeff King <peff@peff.net>
---
t/t5300-pack-object.sh | 23 ++++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index 1e10c832a6..887e2d8d88 100755
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -34,8 +34,22 @@ test_expect_success 'setup' '
} >expect
'
+# usage: check_deltas <stderr_from_pack_objects> <cmp_op> <nr_deltas>
+# e.g.: check_deltas stderr -gt 0
+check_deltas() {
+ deltas=$(perl -lne '/delta (\d+)/ and print $1' "$1") &&
+ shift &&
+ if ! test "$deltas" "$@"
+ then
+ echo >&2 "unexpected number of deltas (compared $delta $*)"
+ return 1
+ fi
+}
+
test_expect_success 'pack without delta' '
- packname_1=$(git pack-objects --window=0 test-1 <obj-list)
+ packname_1=$(git pack-objects --progress --window=0 test-1 \
+ <obj-list 2>stderr) &&
+ check_deltas stderr = 0
'
test_expect_success 'pack-objects with bogus arguments' '
@@ -62,15 +76,18 @@ test_expect_success 'unpack without delta' '
'
test_expect_success 'pack with REF_DELTA' '
- packname_2=$(git pack-objects test-2 <obj-list)
+ packname_2=$(git pack-objects --progress test-2 <obj-list 2>stderr) &&
+ check_deltas stderr -gt 0
'
test_expect_success 'unpack with REF_DELTA' '
check_unpack test-2-${packname_2}
'
test_expect_success 'pack with OFS_DELTA' '
- packname_3=$(git pack-objects --delta-base-offset test-3 <obj-list)
+ packname_3=$(git pack-objects --progress --delta-base-offset test-3 \
+ <obj-list 2>stderr) &&
+ check_deltas stderr -gt 0
'
test_expect_success 'unpack with OFS_DELTA' '
--
2.31.1.875.g5dccece0aa
next prev parent reply other threads:[~2021-05-01 14:03 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-01 14:02 [PATCH 0/5] pack-objects: better handling of negative options Jeff King
2021-05-01 14:02 ` [PATCH 1/5] t5300: modernize basic tests Jeff King
2021-05-03 5:27 ` Junio C Hamano
2021-05-03 14:53 ` Jeff King
2021-05-01 14:03 ` Jeff King [this message]
2021-05-01 14:03 ` [PATCH 3/5] pack-objects: clamp negative window size to 0 Jeff King
2021-05-03 12:10 ` Derrick Stolee
2021-05-03 14:55 ` Jeff King
2021-05-04 18:47 ` René Scharfe
2021-05-04 21:38 ` Jeff King
2021-05-05 11:53 ` Ævar Arnfjörð Bjarmason
2021-05-05 16:19 ` René Scharfe
2021-05-01 14:04 ` [PATCH 4/5] t5316: check behavior of pack-objects --depth=0 Jeff King
2021-05-01 14:04 ` [PATCH 5/5] pack-objects: clamp negative depth to 0 Jeff King
2021-05-03 12:11 ` Derrick Stolee
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=YI1frTcgfGb6GA3N@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=yguoaz@gmail.com \
/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).