diff options
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-02-09 22:41:49 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-02-10 13:54:34 -0800 |
commit | 9e9c7dd6f13e9a5027538854132b9f6b6ddb6be2 (patch) | |
tree | 8f0c77266e37b662cc1b4fd95105a0e2c2f1ef6f | |
parent | c0eedbc009d9587602bfb2057158c102a88acf3f (diff) | |
download | git-9e9c7dd6f13e9a5027538854132b9f6b6ddb6be2.tar.gz |
test lib: change "error" to "BUG" as appropriate
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. 165293af3ce (tests: send "bug in the test script" errors to the
script's stderr, 2018-11-19)
2. 30d0b6dccbc (test-lib-functions: make 'test_cmp_rev' more
informative on failure, 2018-11-19)
3. 900721e15c4 (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>
-rw-r--r-- | t/test-lib-functions.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index 6bca002316..0d40f8a598 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -1105,7 +1105,7 @@ test_cmp_rev () { fi if test $# != 2 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 local r1 r2 r1=$(git rev-parse --verify "$1") && @@ -1216,7 +1216,7 @@ test_atexit () { # doing so on Bash is better than nothing (the test will # silently pass on other shells). 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="{ $* } && (exit \"\$eval_ret\"); eval_ret=\$?; $test_atexit_cleanup" } |