diff options
| author | Pavel Roskin <proski@gnu.org> | 2005-08-10 23:56:21 -0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-11 18:26:16 -0700 |
| commit | 4d9d62fa7ca01c481d224e2a2187e38ec2f0996a (patch) | |
| tree | 273d35e3cf278fff4a64824c36571ba385207b63 /t/t5400-send-pack.sh | |
| parent | d9bdd39eee54ebd77bc01235c00e827ddbe892d0 (diff) | |
| download | git-4d9d62fa7ca01c481d224e2a2187e38ec2f0996a.tar.gz git-4d9d62fa7ca01c481d224e2a2187e38ec2f0996a.tar.xz | |
[PATCH] Trapping exit in tests, using return for errors
I have noticed that "make test" fails without any explanations when the
"merge" utility is missing. I don't think tests should be silent in
case of failure.
It turned out that the particular test was using "exit" to interrupt the
test in case of an error. This caused the whole test script to exit.
No further tests would be run even if "--immediate" wasn't specified.
No error message was printed.
This patch does following:
All instances of "exit", "exit 1" and "(exit 1)" in tests have been
replaced with "return 1". In fact, "(exit 1)" had no effect.
File descriptor 5 is duplicated from file descriptor 1. This is needed
to print important error messages from tests.
New function test_run_() has been introduced. Any "return" in the test
would merely cause that function to return without skipping calls to
test_failure_() and test_ok_(). The new function also traps "exit" and
treats it like a fatal error (in case somebody reintroduces "exit" in
the tests).
test_expect_failure() and test_expect_success() check both the result of
eval and the return value of test_run_(). If the later is not 0, it's
always a failure because it indicates the the test didn't complete.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t5400-send-pack.sh')
| -rwxr-xr-x | t/t5400-send-pack.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh index a362c6ebe..2c142dfeb 100755 --- a/t/t5400-send-pack.sh +++ b/t/t5400-send-pack.sh @@ -18,7 +18,7 @@ test_expect_success setup ' do sleep 1 && commit=$(echo "Commit #$i" | git-commit-tree $tree -p $parent) && - parent=$commit || exit + parent=$commit || return 1 done && echo "$commit" >.git/HEAD && git clone -l ./. victim && @@ -31,7 +31,7 @@ test_expect_success setup ' do sleep 1 && commit=$(echo "Rebase #$i" | git-commit-tree $tree -p $parent) && - parent=$commit || exit + parent=$commit || return 1 done && echo "$commit" >.git/HEAD && echo Rebase && |