From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Martin Ågren" <martin.agren@gmail.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Johannes Sixt" <j6t@kdbg.org>
Subject: [PATCH v3 15/28] t4007: abstract away SHA-1-specific constants
Date: Wed, 16 May 2018 01:56:17 +0000 [thread overview]
Message-ID: <20180516015630.661349-16-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <20180516015630.661349-1-sandals@crustytoothpaste.net>
Adjust the test so that it computes variables for blobs and uses the
ZERO_OID variable instead of using hard-coded hashes.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
t/t4007-rename-3.sh | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/t/t4007-rename-3.sh b/t/t4007-rename-3.sh
index dae327fabb..b187b7f6c6 100755
--- a/t/t4007-rename-3.sh
+++ b/t/t4007-rename-3.sh
@@ -17,6 +17,7 @@ test_expect_success 'prepare reference tree' '
echo $tree
'
+blob=$(git hash-object "$TEST_DIRECTORY/diff-lib/COPYING")
test_expect_success 'prepare work tree' '
cp path0/COPYING path1/COPYING &&
git update-index --add --remove path0/COPYING path1/COPYING
@@ -26,8 +27,8 @@ test_expect_success 'prepare work tree' '
# path1 both have COPYING and the latter is a copy of path0/COPYING.
# Comparing the full tree with cache should tell us so.
-cat >expected <<\EOF
-:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 6ff87c4664981e4397625791c8ea3bbb5f2279a3 C100 path0/COPYING path1/COPYING
+cat >expected <<EOF
+:100644 100644 $blob $blob C100 path0/COPYING path1/COPYING
EOF
test_expect_success 'copy detection' '
@@ -46,8 +47,8 @@ test_expect_success 'copy detection, cached' '
# path1/COPYING suddenly appearing from nowhere, not detected as
# a copy from path0/COPYING.
-cat >expected <<\EOF
-:000000 100644 0000000000000000000000000000000000000000 6ff87c4664981e4397625791c8ea3bbb5f2279a3 A path1/COPYING
+cat >expected <<EOF
+:000000 100644 $ZERO_OID $blob A path1/COPYING
EOF
test_expect_success 'copy, limited to a subtree' '
@@ -64,8 +65,8 @@ test_expect_success 'tweak work tree' '
# path0/COPYING. Showing the full tree with cache should tell us about
# the rename.
-cat >expected <<\EOF
-:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 6ff87c4664981e4397625791c8ea3bbb5f2279a3 R100 path0/COPYING path1/COPYING
+cat >expected <<EOF
+:100644 100644 $blob $blob R100 path0/COPYING path1/COPYING
EOF
test_expect_success 'rename detection' '
@@ -78,8 +79,8 @@ test_expect_success 'rename detection' '
# path0/COPYING. When we say we care only about path1, we should just
# see path1/COPYING appearing from nowhere.
-cat >expected <<\EOF
-:000000 100644 0000000000000000000000000000000000000000 6ff87c4664981e4397625791c8ea3bbb5f2279a3 A path1/COPYING
+cat >expected <<EOF
+:000000 100644 $ZERO_OID $blob A path1/COPYING
EOF
test_expect_success 'rename, limited to a subtree' '
next prev parent reply other threads:[~2018-05-16 1:59 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-16 1:56 [PATCH v3 00/28] Hash-independent tests brian m. carlson
2018-05-16 1:56 ` [PATCH v3 01/28] t/test-lib: add an SHA1 prerequisite brian m. carlson
2018-05-16 1:56 ` [PATCH v3 02/28] t/test-lib: introduce ZERO_OID brian m. carlson
2018-05-16 1:56 ` [PATCH v3 03/28] t: switch $_z40 to $ZERO_OID brian m. carlson
2018-05-16 1:56 ` [PATCH v3 04/28] t/test-lib: introduce OID_REGEX brian m. carlson
2018-05-16 1:56 ` [PATCH v3 05/28] t: switch $_x40 to $OID_REGEX brian m. carlson
2018-05-16 1:56 ` [PATCH v3 06/28] t0000: annotate with SHA1 prerequisite brian m. carlson
2018-05-16 1:56 ` [PATCH v3 07/28] t1007: " brian m. carlson
2018-05-16 16:56 ` Stefan Beller
2018-05-16 23:10 ` brian m. carlson
2018-05-16 1:56 ` [PATCH v3 08/28] t1512: skip test if not using SHA-1 brian m. carlson
2018-05-16 1:56 ` [PATCH v3 09/28] t4044: " brian m. carlson
2018-05-16 1:56 ` [PATCH v3 10/28] t: skip pack tests " brian m. carlson
2018-05-16 1:56 ` [PATCH v3 11/28] t2203: abstract away SHA-1-specific constants brian m. carlson
2018-05-16 1:56 ` [PATCH v3 12/28] t3103: " brian m. carlson
2018-05-16 1:56 ` [PATCH v3 13/28] t3702: " brian m. carlson
2018-05-16 17:18 ` Stefan Beller
2018-05-16 23:46 ` brian m. carlson
2018-05-16 1:56 ` [PATCH v3 14/28] t3905: " brian m. carlson
2018-05-16 1:56 ` brian m. carlson [this message]
2018-05-16 1:56 ` [PATCH v3 16/28] t4008: " brian m. carlson
2018-05-16 1:56 ` [PATCH v3 17/28] t4014: " brian m. carlson
2018-05-16 1:56 ` [PATCH v3 18/28] t4020: " brian m. carlson
2018-05-16 1:56 ` [PATCH v3 19/28] t4022: " brian m. carlson
2018-05-16 1:56 ` [PATCH v3 20/28] t4029: fix test indentation brian m. carlson
2018-05-16 1:56 ` [PATCH v3 21/28] t4029: abstract away SHA-1-specific constants brian m. carlson
2018-05-16 1:56 ` [PATCH v3 22/28] t4030: " brian m. carlson
2018-05-16 1:56 ` [PATCH v3 23/28] t/lib-diff-alternative: " brian m. carlson
2018-05-16 1:56 ` [PATCH v3 24/28] t4205: sort log output in a hash-independent way brian m. carlson
2018-05-16 1:56 ` [PATCH v3 25/28] t4042: abstract away SHA-1-specific constants brian m. carlson
2018-05-16 1:56 ` [PATCH v3 26/28] t4045: " brian m. carlson
2018-05-16 1:56 ` [PATCH v3 27/28] t4208: " brian m. carlson
2018-05-16 1:56 ` [PATCH v3 28/28] t5300: " brian m. carlson
2018-05-21 2:01 ` [PATCH v4 00/28] Hash-independent tests brian m. carlson
2018-05-21 2:01 ` [PATCH v4 01/28] t/test-lib: add an SHA1 prerequisite brian m. carlson
2018-05-21 2:01 ` [PATCH v4 02/28] t/test-lib: introduce ZERO_OID brian m. carlson
2018-05-21 2:01 ` [PATCH v4 03/28] t: switch $_z40 to $ZERO_OID brian m. carlson
2018-05-21 2:01 ` [PATCH v4 04/28] t/test-lib: introduce OID_REGEX brian m. carlson
2018-05-21 2:01 ` [PATCH v4 05/28] t: switch $_x40 to $OID_REGEX brian m. carlson
2018-05-21 2:01 ` [PATCH v4 06/28] t0000: annotate with SHA1 prerequisite brian m. carlson
2018-05-21 2:01 ` [PATCH v4 07/28] t1007: " brian m. carlson
2018-05-21 2:01 ` [PATCH v4 08/28] t1512: skip test if not using SHA-1 brian m. carlson
2018-05-21 2:01 ` [PATCH v4 09/28] t4044: " brian m. carlson
2018-05-21 2:01 ` [PATCH v4 10/28] t: skip pack tests " brian m. carlson
2018-05-21 2:01 ` [PATCH v4 11/28] t2203: abstract away SHA-1-specific constants brian m. carlson
2018-05-21 2:01 ` [PATCH v4 12/28] t3103: " brian m. carlson
2018-05-21 2:01 ` [PATCH v4 13/28] t3702: " brian m. carlson
2018-05-21 2:01 ` [PATCH v4 14/28] t3905: " brian m. carlson
2018-05-21 2:01 ` [PATCH v4 15/28] t4007: " brian m. carlson
2018-05-21 2:01 ` [PATCH v4 16/28] t4008: " brian m. carlson
2018-05-21 2:01 ` [PATCH v4 17/28] t4014: " brian m. carlson
2018-05-21 2:01 ` [PATCH v4 18/28] t4020: " brian m. carlson
2018-05-21 2:01 ` [PATCH v4 19/28] t4022: " brian m. carlson
2018-05-21 2:01 ` [PATCH v4 20/28] t4029: fix test indentation brian m. carlson
2018-05-21 2:01 ` [PATCH v4 21/28] t4029: abstract away SHA-1-specific constants brian m. carlson
2018-05-21 2:01 ` [PATCH v4 22/28] t4030: " brian m. carlson
2018-05-21 2:01 ` [PATCH v4 23/28] t/lib-diff-alternative: " brian m. carlson
2018-05-21 2:01 ` [PATCH v4 24/28] t4205: sort log output in a hash-independent way brian m. carlson
2018-05-21 2:01 ` [PATCH v4 25/28] t4042: abstract away SHA-1-specific constants brian m. carlson
2018-05-21 2:01 ` [PATCH v4 26/28] t4045: " brian m. carlson
2018-05-21 2:01 ` [PATCH v4 27/28] t4208: " brian m. carlson
2018-05-21 2:01 ` [PATCH v4 28/28] t5300: " brian m. carlson
2018-05-21 13:17 ` [PATCH v4 00/28] Hash-independent tests Ben Peart
2018-05-21 23:08 ` 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=20180516015630.661349-16-sandals@crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=martin.agren@gmail.com \
--cc=pclouds@gmail.com \
--cc=sunshine@sunshineco.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).