t: move 'hex2oct' into test-lib-functions.sh

ttaylorr · gitster · commit 5c07647d987d · 2019-04-05T15:06:04.000+09:00
The helper 'hex2oct' is used to convert base-16 encoded data into a
base-8 binary form, and is useful for preparing data for commands that
accept input in a binary format, such as 'git hash-object', via
'printf'.

This helper is defined identically in three separate places throughout
't'. Move the definition to test-lib-function.sh, so that it can be used
in new test suites, and its definition is not redundant.

This will likewise make our job easier in the subsequent commit, which
also uses 'hex2oct'.

Signed-off-by: Taylor Blau &lt;me@ttaylorr.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t1007-hash-object.sh b/t/t1007-hash-object.sh
@@ -199,10 +199,6 @@ test_expect_success 'too-short tree' '
 	test_i18ngrep "too-short tree object" err
 '
 
-hex2oct() {
-    perl -ne 'printf "\\%03o", hex for /../g'
-}
-
 test_expect_success 'malformed mode in tree' '
 	hex_sha1=$(echo foo | git hash-object --stdin -w) &&
 	bin_sha1=$(echo $hex_sha1 | hex2oct) &&
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
@@ -256,10 +256,6 @@ test_expect_success 'unparseable tree object' '
 	test_i18ngrep ! "fatal: empty filename in tree entry" out
 '
 
-hex2oct() {
-	perl -ne 'printf "\\%03o", hex for /../g'
-}
-
 test_expect_success 'tree entry with type mismatch' '
 	test_when_finished "remove_object \$blob" &&
 	test_when_finished "remove_object \$tree" &&
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
@@ -611,10 +611,6 @@ test_expect_success 'GIT_TRACE_PACKFILE produces a usable pack' '
 	git -C replay.git index-pack -v --stdin <tmp.pack
 '
 
-hex2oct () {
-	perl -ne 'printf "\\%03o", hex for /../g'
-}
-
 test_expect_success 'clone on case-insensitive fs' '
 	git init icasefs &&
 	(
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
@@ -1202,6 +1202,12 @@ depacketize () {
 	'
 }
 
+# Converts base-16 data into base-8. The output is given as a sequence of
+# escaped octals, suitable for consumption by 'printf'.
+hex2oct () {
+	perl -ne 'printf "\\%03o", hex for /../g'
+}
+
 # Set the hash algorithm in use to $1.  Only useful when testing the testsuite.
 test_set_hash () {
 	test_hash_algo="$1"

Original file line number	Diff line number	Diff line change
`@@ -611,10 +611,6 @@ test_expect_success 'GIT_TRACE_PACKFILE produces a usable pack' '`
`611`	`611`	`git -C replay.git index-pack -v --stdin <tmp.pack`
`612`	`612`	`'`
`613`	`613`
`614`		`-hex2oct () {`
`615`		`- perl -ne 'printf "\\%03o", hex for /../g'`
`616`		`-}`
`617`		`-`
`618`	`614`	`test_expect_success 'clone on case-insensitive fs' '`
`619`	`615`	`git init icasefs &&`
`620`	`616`	`(`
Original file line number	Diff line number	Diff line change
`@@ -1202,6 +1202,12 @@ depacketize () {`
`1202`	`1202`	`'`
`1203`	`1203`	`}`
`1204`	`1204`
	`1205`	`+# Converts base-16 data into base-8. The output is given as a sequence of`
	`1206`	`+# escaped octals, suitable for consumption by 'printf'.`
	`1207`	`+hex2oct () {`
	`1208`	`+ perl -ne 'printf "\\%03o", hex for /../g'`
	`1209`	`+}`
	`1210`	`+`
`1205`	`1211`	`# Set the hash algorithm in use to $1. Only useful when testing the testsuite.`
`1206`	`1212`	`test_set_hash () {`
`1207`	`1213`	`test_hash_algo="$1"`