I'm away from a computer right now. Junio, if gmail is showing me the
entirety of your workaround, then no, I don't think that will work.
Your code will always exit non-zero, but there are cases where 'exit
0' is called and a '0' exit status is desired. e.g. when test_done is
called.
I'll look more closely at the suggestions when I get back to a computer.
-brandon
On 10/9/09, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Brandon Casey <casey@xxxxxxxxxxxxxxx> writes:
>
>> From: Brandon Casey <drafnel@xxxxxxxxx>
>>
>> Commit 6e7b5aaf introduced the concept of GIT_EXIT_OK as a way to indicate
>> to die(), the exit handler, whether the exit was initiated by the test
>> harness, or whether it was unexpected. die() expects $? to contain the
>> value passed to exit(), and when GIT_EXIT_OK is set, die() calls exit with
>> the value in $?. This works as expected when using the Bash shell. For
>> the Korn shell, $? has the value of the last executed statement _before_
>> the call to exit. If that statement completed successfully, then die()
>> would incorrectly exit with a successful status when GIT_EXIT_OK is set.
>
> That's somewhat unexpected, as I did not think this was an anomaly in
> bash. FWIW, dash seems to behave the same way.
>
> The environment in which the shell executes a trap on EXIT shall be
> identical to the environment immediately after the last command executed
> before the trap on EXIT was taken.
>
> If the trap action was triggered because somebody called "exit 13", $? is
> expected to contain that value, because that is the last command executed
> before the trap on EXIT was taken, no?
>
>> So, rather than relying on the behavior of Bash in order to get the exit
>> code from $? inside die(), change GIT_EXIT_OK into GIT_EXIT_CODE, and set
>> it to the code that we want to exit with. This allows the test suite to
>> be run with the Korn shell.
>
> I wonder if the attached is a more clear and contained workaround for this
> issue.
>
> ---
> t/test-lib.sh | 9 ++++++++-
> 1 files changed, 8 insertions(+), 1 deletions(-)
>
> diff --git a/t/test-lib.sh b/t/test-lib.sh
> index f2ca536..c47a295 100644
> --- a/t/test-lib.sh
> +++ b/t/test-lib.sh
> @@ -185,7 +185,14 @@ die () {
> code=$?
> if test -n "$GIT_EXIT_OK"
> then
> - exit $code
> + # Korn does not update $? when "exit 47" triggers
> + # the EXIT trap.
> + if test $code = 0
> + then
> + exit 1
> + else
> + exit $code
> + fi
> else
> echo >&5 "FATAL: Unexpected exit with code $code"
> exit 1
>
--
Sent from my mobile device
--
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