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@xxxxxxxxx>
---
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 529f3a4d08..0b9ecdb6db 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.33.0.rc0.635.g0ab9d6d3b5a
