[PATCH v2 7/8] test-lib tests: refactor common part of check_sub_test_lib_test*()
flat view
STALE1863d
SUPERSEDED
From: Ævar Arnfjörð Bjarmason <hidden>
Date: 2021-07-21 22:58:40
Subsystem:
the rest · Maintainer:
Linus Torvalds
Status: Superseded by v4 (posted 2021-09-22). [go to v4]
Revision v2 (4 revisions archived).
Revisions (4)
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 <redacted> --- t/lib-subtest.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/t/lib-subtest.sh b/t/lib-subtest.sh
index 96a4e6e259a..2fde75e8863 100644
--- a/t/lib-subtest.sh
+++ b/t/lib-subtest.sh@@ -109,18 +109,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 }
--
2.32.0.955.ge7c5360f7e7