Re: [PATCH] t0005: add test for trap handling from deeply nested function calls
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 26, 2010, 20:10 UTC
- Message-ID
- <7v7hoykfo7.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <vm2zHZjrZOha7LnIM_9fAEAvwVZrJtZlAI9f2XI_VUsdqr51ihAMW68a5BT9tvMdRDSqk6GYlSE@cipher.nrlssc.navy.mil>
Brandon Casey <casey@nrlssc.navy.mil> writes:
Show 14 quoted lines
> From: Brandon Casey <drafnel@gmail.com> > > The /usr/xpg4/bin/sh shell on Solaris only executes a trap handler set > within a function from the first-level function call made from within the > function that set the trap. In other words, if func1 sets a trap, then > calls func2 which triggers the trap, then the trap handler will be executed > correctly. If instead of exiting, func2 calls func3, and func3 satisfies > the conditions for triggering the trap, the trap handler will NOT be > executed. > > This trap sequence exists in git-bisect.sh and is exercised by tests > t6030.12 and t6030.13 which fail when the /usr/xpg4/bin/sh shell is used. > > Add a test that will fail sooner and more precisely than the t6030 tests.
That would be useful if you run all the tests in sequence.
It smells like the real solution is to fix git-bisect.sh not to do that trap trick, if we can.
Or perhaps have this not as an individual test but as a code to set a test prerequiste token (e.g. NESTED_TRAP) to run tests of bisect conditionally?
Show 32 quoted lines
>
> Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
> ---
>
>
> Improvements to the commit message are welcome.
>
> -brandon
>
>
> t/t0005-signals.sh | 8 ++++++++
> 1 files changed, 8 insertions(+), 0 deletions(-)
>
> diff --git a/t/t0005-signals.sh b/t/t0005-signals.sh
> index 09f855a..cb68d1f 100755
> --- a/t/t0005-signals.sh
> +++ b/t/t0005-signals.sh
> @@ -19,4 +19,12 @@ test_expect_success 'sigchain works' '
> test_cmp expect actual
> '
>
> +test_expect_success 'trap triggered in deeply nested function works correctly' '
> + (atrap () { exit 0; }
> + func3 () { exit 1; }
> + func2 () { func3; }
> + func1 () { trap atrap EXIT; func2; }
> + func1)
> +'
> +
> test_done
> --
> 1.6.6.2