From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: <git@vger.kernel.org>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v3 07/21] t4013: make test hash independent
Date: Fri, 7 Feb 2020 00:52:40 +0000 [thread overview]
Message-ID: <20200207005254.1495851-8-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <20200207005254.1495851-1-sandals@crustytoothpaste.net>
This test produces a large number of diff formats and compares the
output with test files that have content specific to SHA-1. Since we are
more interested in the format of the diffs, and not their specific
values, which are tested elsewhere, add a function which uses sed to
transform these specific object IDs into generic ones of the right size,
which we can then compare.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
t/t4013-diff-various.sh | 44 +++++++++++++++++++++++++++++++++++------
1 file changed, 38 insertions(+), 6 deletions(-)
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index 5ac94b390d..dde3f11fec 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -120,6 +120,30 @@ test_expect_success setup '
+*++ [initial] Initial
EOF
+process_diffs () {
+ _x04="[0-9a-f][0-9a-f][0-9a-f][0-9a-f]" &&
+ _x07="$_x05[0-9a-f][0-9a-f]" &&
+ sed -e "s/$OID_REGEX/$ZERO_OID/g" \
+ -e "s/From $_x40 /From $ZERO_OID /" \
+ -e "s/from $_x40)/from $ZERO_OID)/" \
+ -e "s/commit $_x40\$/commit $ZERO_OID/" \
+ -e "s/commit $_x40 (/commit $ZERO_OID (/" \
+ -e "s/$_x40 $_x40 $_x40/$ZERO_OID $ZERO_OID $ZERO_OID/" \
+ -e "s/$_x40 $_x40 /$ZERO_OID $ZERO_OID /" \
+ -e "s/^$_x40 $_x40$/$ZERO_OID $ZERO_OID/" \
+ -e "s/^$_x40 /$ZERO_OID /" \
+ -e "s/^$_x40$/$ZERO_OID/" \
+ -e "s/$_x07\.\.$_x07/fffffff..fffffff/g" \
+ -e "s/$_x07,$_x07\.\.$_x07/fffffff,fffffff..fffffff/g" \
+ -e "s/$_x07 $_x07 $_x07/fffffff fffffff fffffff/g" \
+ -e "s/$_x07 $_x07 /fffffff fffffff /g" \
+ -e "s/Merge: $_x07 $_x07/Merge: fffffff fffffff/g" \
+ -e "s/$_x07\.\.\./fffffff.../g" \
+ -e "s/ $_x04\.\.\./ ffff.../g" \
+ -e "s/ $_x04/ ffff/g" \
+ "$1"
+}
+
V=$(git version | sed -e 's/^git version //' -e 's/\./\\./g')
while read magic cmd
do
@@ -158,13 +182,15 @@ do
} >"$actual" &&
if test -f "$expect"
then
+ process_diffs "$actual" >actual &&
+ process_diffs "$expect" >expect &&
case $cmd in
*format-patch* | *-stat*)
- test_i18ncmp "$expect" "$actual";;
+ test_i18ncmp expect actual;;
*)
- test_cmp "$expect" "$actual";;
+ test_cmp expect actual;;
esac &&
- rm -f "$actual"
+ rm -f "$actual" actual expect
else
# this is to help developing new tests.
cp "$actual" "$expect"
@@ -383,16 +409,22 @@ test_expect_success 'log -S requires an argument' '
test_expect_success 'diff --cached on unborn branch' '
echo ref: refs/heads/unborn >.git/HEAD &&
git diff --cached >result &&
- test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--cached" result
+ process_diffs result >actual &&
+ process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--cached" >expected &&
+ test_cmp expected actual
'
test_expect_success 'diff --cached -- file on unborn branch' '
git diff --cached -- file0 >result &&
- test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--cached_--_file0" result
+ process_diffs result >actual &&
+ process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--cached_--_file0" >expected &&
+ test_cmp expected actual
'
test_expect_success 'diff --line-prefix with spaces' '
git diff --line-prefix="| | | " --cached -- file0 >result &&
- test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--line-prefix_--cached_--_file0" result
+ process_diffs result >actual &&
+ process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--line-prefix_--cached_--_file0" >expected &&
+ test_cmp expected actual
'
test_expect_success 'diff-tree --stdin with log formatting' '
next prev parent reply other threads:[~2020-02-07 0:53 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-07 0:52 [PATCH v3 00/21] SHA-256 test fixes, part 8 brian m. carlson
2020-02-07 0:52 ` [PATCH v3 01/21] t/lib-pack: support SHA-256 brian m. carlson
2020-02-07 0:52 ` [PATCH v3 02/21] t3206: make hash size independent brian m. carlson
2020-02-07 0:52 ` [PATCH v3 03/21] t3308: make test work with SHA-256 brian m. carlson
2020-02-07 0:52 ` [PATCH v3 04/21] t3309: " brian m. carlson
2020-02-07 0:52 ` [PATCH v3 05/21] t3310: " brian m. carlson
2020-02-07 0:52 ` [PATCH v3 06/21] t3311: " brian m. carlson
2020-02-07 0:52 ` brian m. carlson [this message]
2020-02-07 0:52 ` [PATCH v3 08/21] t4211: move SHA-1-specific test cases into a directory brian m. carlson
2020-02-07 0:52 ` [PATCH v3 09/21] t4211: add test cases for SHA-256 brian m. carlson
2020-02-07 0:52 ` [PATCH v3 10/21] t4060: make test work with SHA-256 brian m. carlson
2020-02-07 0:52 ` [PATCH v3 11/21] t5302: make hash size independent brian m. carlson
2020-02-07 0:52 ` [PATCH v3 12/21] t5309: make test hash independent brian m. carlson
2020-02-07 0:52 ` [PATCH v3 13/21] t5313: " brian m. carlson
2020-02-07 0:52 ` [PATCH v3 14/21] t5321: " brian m. carlson
2020-02-07 0:52 ` [PATCH v3 15/21] t5515: " brian m. carlson
2020-02-07 0:52 ` [PATCH v3 16/21] t5318: update for SHA-256 brian m. carlson
2020-02-07 0:52 ` [PATCH v3 17/21] t5607: make hash size independent brian m. carlson
2020-02-07 0:52 ` [PATCH v3 18/21] t5703: make test work with SHA-256 brian m. carlson
2020-02-07 0:52 ` [PATCH v3 19/21] t6000: abstract away SHA-1-specific constants brian m. carlson
2020-02-07 0:52 ` [PATCH v3 20/21] t6006: make hash size independent brian m. carlson
2020-02-07 0:52 ` [PATCH v3 21/21] t6024: update for SHA-256 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=20200207005254.1495851-8-sandals@crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).