diff options
| -rwxr-xr-x | t/t0000-basic.sh | 21 | ||||
| -rw-r--r-- | t/test-lib.sh | 7 |
2 files changed, 25 insertions, 3 deletions
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh index f4ca4fc85c..3ec9cbef2c 100755 --- a/t/t0000-basic.sh +++ b/t/t0000-basic.sh @@ -73,6 +73,27 @@ then exit 1 fi +clean=no +test_expect_success 'tests clean up after themselves' ' + test_when_finished clean=yes +' + +cleaner=no +test_expect_code 1 'tests clean up even after a failure' ' + test_when_finished cleaner=yes && + (exit 1) +' + +if test $clean$cleaner != yesyes +then + say "bug in test framework: cleanup commands do not work reliably" + exit 1 +fi + +test_expect_code 2 'failure to clean up causes the test to fail' ' + test_when_finished "(exit 2)" +' + ################################################################ # Basics of the basics diff --git a/t/test-lib.sh b/t/test-lib.sh index acce3d06a8..7422bba47e 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -366,8 +366,9 @@ test_debug () { } test_run_ () { - test_cleanup='eval_ret=$?' + test_cleanup=: eval >&3 2>&4 "$1" + eval_ret=$? eval >&3 2>&4 "$test_cleanup" return 0 } @@ -567,8 +568,8 @@ test_cmp() { # the test to pass. test_when_finished () { - test_cleanup="eval_ret=\$?; { $* - } && (exit \"\$eval_ret\"); $test_cleanup" + test_cleanup="{ $* + } && (exit \"\$eval_ret\"); eval_ret=\$?; $test_cleanup" } # Most tests can use the created repository, but some may need to create more. |