diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2019-06-28 22:59:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-01 20:28:18 (GMT) |
| commit | 4772b338786eb5025320b8f2e53f78abb417c3e0 (patch) | |
| tree | c834dded4e139c8ff4ec0614b0be80ae70b5f304 /t/t0027-auto-crlf.sh | |
| parent | 0795aed0a09deea5a6a51c08465f6703015871a7 (diff) | |
| download | git-4772b338786eb5025320b8f2e53f78abb417c3e0.zip git-4772b338786eb5025320b8f2e53f78abb417c3e0.tar.gz git-4772b338786eb5025320b8f2e53f78abb417c3e0.tar.bz2 | |
t0027: make hash size independent
Several parts of this test generate files that have specific hard-coded
object IDs in them. We don't really care about what the object ID in
question is, so we turn them all to zeros.
However, because some of these values are fixed and some are generated,
they can be of different lengths, which causes problems when running
with SHA-256. Furthermore, some assertions in this test use only fixed
object IDs and some use both fixed and generated ones, so converting
only the expected results fixes some tests while breaking others.
Convert both actual and expected object IDs to the all-zeros object ID
of the appropriate length to ensure that the test passes when using
SHA-256.
The astute observer will notice that both tr and sed are used here.
Converting the tr call to a sed y/// command looks logical at first, but
it isn't possible because POSIX doesn't allow escapes in y/// commands
other than "\\" and "\n".
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t0027-auto-crlf.sh')
| -rwxr-xr-x | t/t0027-auto-crlf.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh index 3587e45..959b6da 100755 --- a/t/t0027-auto-crlf.sh +++ b/t/t0027-auto-crlf.sh @@ -15,8 +15,10 @@ compare_ws_file () { pfx=$1 exp=$2.expect act=$pfx.actual.$3 - tr '\015\000abcdef0123456789' QN00000000000000000 <"$2" >"$exp" && - tr '\015\000abcdef0123456789' QN00000000000000000 <"$3" >"$act" && + tr '\015\000abcdef0123456789' QN00000000000000000 <"$2" | + sed -e "s/0000*/$ZERO_OID/" >"$exp" && + tr '\015\000abcdef0123456789' QN00000000000000000 <"$3" | + sed -e "s/0000*/$ZERO_OID/" >"$act" && test_cmp "$exp" "$act" && rm "$exp" "$act" } |