From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Wed, 22 Sep 2021 11:19:51 +0000 (+0200)
Subject: test-lib tests: refactor common part of check_sub_test_lib_test*()
X-Git-Tag: v2.34.0-rc0~62^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e07b817cfca9d15e6930dc09344846fb5246d4d7;p=thirdparty%2Fgit.git

test-lib tests: refactor common part of check_sub_test_lib_test*()

Refactor the two check_sub_test_lib_test*() functions to avoid
duplicating the same comparison they did of stdout. This duplication
was initially added when check_sub_test_lib_test_err() was added in
0445e6f0a12 (test-lib: '--run' to run only specific tests,
2014-04-30).

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/lib-subtest.sh b/t/lib-subtest.sh
index 0737fab98a..cdadc0c7fc 100644
--- a/t/lib-subtest.sh
+++ b/t/lib-subtest.sh
@@ -77,18 +77,22 @@ run_sub_test_lib_test_err () {
 	_run_sub_test_lib_test_common '!' "$@"
 }
 
+_check_sub_test_lib_test_common () {
+	name="$1" &&
+	sed -e 's/^> //' -e 's/Z$//' >"$name"/expect.out &&
+	test_cmp "$name"/expect.out "$name"/out
+}
+
 check_sub_test_lib_test () {
 	name="$1" # stdin is the expected output from the test
-	test_must_be_empty "$name"/err &&
-	sed -e 's/^> //' -e 's/Z$//' >"$name"/expect &&
-	test_cmp "$name/"expect "$name"/out
+	_check_sub_test_lib_test_common "$name" &&
+	test_must_be_empty "$name"/err
 }
 
 check_sub_test_lib_test_err () {
 	name="$1" # stdin is the expected output from the test
+	_check_sub_test_lib_test_common "$name" &&
 	# expected error output is in descriptor 3
-	sed -e 's/^> //' -e 's/Z$//' >"$name"/expect.out &&
-	test_cmp "$name"/expect.out "$name"/out &&
 	sed -e 's/^> //' -e 's/Z$//' <&3 >"$name"/expect.err &&
 	test_cmp "$name"/expect.err "$name"/err
 }