mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test lib: change "error" to "BUG" as appropriate

Browse Source 
Change two uses of "error" in test-lib-functions.sh to "BUG".

In the first instance in "test_cmp_rev" the author of the "BUG"
function added in [1] had another in-flight patch adding this in [2],
and the two were never consolidated.

In the second case in "test_atexit" added in [3] that we could have
instead used "BUG" appears to have been missed.

1. 165293af3c (tests: send "bug in the test script" errors to the
   script's stderr, 2018-11-19)

2. 30d0b6dccb (test-lib-functions: make 'test_cmp_rev' more
   informative on failure, 2018-11-19)

3. 900721e15c (test-lib: introduce 'test_atexit', 2019-03-13)

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2021-02-09 22:41:49 +01:00
committed by Junio C Hamano
parent c0eedbc009
commit 9e9c7dd6f1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
t/test-lib-functions.sh
View File

@ -1105,7 +1105,7 @@ test_cmp_rev () {
fi fi
if test $# != 2 if test $# != 2
then then
error "bug in the test script: test_cmp_rev requires two revisions, but got $#" BUG "test_cmp_rev requires two revisions, but got $#"
else else
local r1 r2 local r1 r2
r1=$(git rev-parse --verify "$1") && r1=$(git rev-parse --verify "$1") &&
@ -1216,7 +1216,7 @@ test_atexit () {
# doing so on Bash is better than nothing (the test will # doing so on Bash is better than nothing (the test will
# silently pass on other shells). # silently pass on other shells).
test "${BASH_SUBSHELL-0}" = 0 || test "${BASH_SUBSHELL-0}" = 0 ||
error "bug in test script: test_atexit does nothing in a subshell" BUG "test_atexit does nothing in a subshell"
test_atexit_cleanup="{ $* test_atexit_cleanup="{ $*
} && (exit \"\$eval_ret\"); eval_ret=\$?; $test_atexit_cleanup" } && (exit \"\$eval_ret\"); eval_ret=\$?; $test_atexit_cleanup"
} }