kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
0445e6f0a1 (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>
maint
Ævar Arnfjörð Bjarmason 2021-09-22 13:19:51 +02:00 committed by Junio C Hamano
parent 12fe4909fa
commit e07b817cfc
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
t/lib-subtest.sh
View File

@ -77,18 +77,22 @@ run_sub_test_lib_test_err () {
_run_sub_test_lib_test_common '!' "$@" _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 () { check_sub_test_lib_test () {
name="$1" # stdin is the expected output from the test name="$1" # stdin is the expected output from the test
test_must_be_empty "$name"/err && _check_sub_test_lib_test_common "$name" &&
sed -e 's/^> //' -e 's/Z$//' >"$name"/expect && test_must_be_empty "$name"/err
test_cmp "$name/"expect "$name"/out
} }


check_sub_test_lib_test_err () { check_sub_test_lib_test_err () {
name="$1" # stdin is the expected output from the test name="$1" # stdin is the expected output from the test
_check_sub_test_lib_test_common "$name" &&
# expected error output is in descriptor 3 # 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 && sed -e 's/^> //' -e 's/Z$//' <&3 >"$name"/expect.err &&
test_cmp "$name"/expect.err "$name"/err test_cmp "$name"/expect.err "$name"/err
} }