Junio C Hamano venit, vidit, dixit 27.06.2011 20:02:
> Some tests try to be too careful about cleaning themselves up and
> do
>
> test_expect_success description '
> set-up some test refs and/or configuration &&
> test_when_finished "revert the above changes" &&
> the real test
> '
>
> Which is nice to make sure that a potential failure would not have
> unexpected interaction with the next test. This however interferes when
> "the real test" fails and we want to see what is going on, by running the
> test with --immediate mode and descending into its trash directory after
> the test stops. The precondition to run the real test and cause it to fail
> is all gone after the clean-up procedure defined by test_when_finished is
> done.
>
> Update test_run_ which is the workhorse of running a test script
> called from test_expect_success and test_expect_failure, so that we do not
> run clean-up script defined with test_when_finished when a test that is
> expected to succeed fails under the --immediate mode.
>
> Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
> ---
>
> * Likes, dislikes?
Likes!
>
> t/test-lib.sh | 12 ++++++++++--
> 1 files changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/t/test-lib.sh b/t/test-lib.sh
> index 8c57a00..e36e67a 100644
> --- a/t/test-lib.sh
> +++ b/t/test-lib.sh
> @@ -446,9 +446,14 @@ test_debug () {
>
> test_run_ () {
> test_cleanup=:
> + expecting_failure=$1
> eval >&3 2>&4 "$1"
> eval_ret=$?
> - eval >&3 2>&4 "$test_cleanup"
> +
> + if test -z "$immediate" || test $eval_ret = 0 || test -n "$expecting_failure"
One may argue that a "test_expect_failure" which succeeds is a fail and
should stop with --immediate (so that it's easier to spot fixed bugs),
but...
> + then
> + eval >&3 2>&4 "$test_cleanup"
> + fi
> if test "$verbose" = "t" && test -n "$HARNESS_ACTIVE"; then
> echo ""
> fi
> @@ -497,7 +502,7 @@ test_expect_failure () {
> if ! test_skip "$@"
> then
> say >&3 "checking known breakage: $2"
> - test_run_ "$2"
> + test_run_ "$2" expecting_failure
> if [ "$?" = 0 -a "$eval_ret" = 0 ]
> then
> test_known_broken_ok_ "$1"
...we would have to change that here also, and it would be a change in
behaviour of the test suite. Anyway, that is orthogonal to this patch
which I do like.
> @@ -774,6 +779,9 @@ test_cmp() {
> #
> # except that the greeting and config --unset must both succeed for
> # the test to pass.
> +#
> +# Note that under --immediate mode, no clean-up is done to help diagnose
> +# what went wrong.
>
> test_when_finished () {
> test_cleanup="{ $*
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html