Jeff King wrote:
> --- a/t/test-lib.sh
> +++ b/t/test-lib.sh
> @@ -591,7 +591,15 @@ test_path_is_missing () {
>
> test_must_fail () {
> "$@"
> - test $? -gt 0 -a $? -le 129 -o $? -gt 192
> + exit_code=$?
> + if test $exit_code = 0; then
> + echo >&2 "test_must_fail: command succeeded: $*"
> + return 1
> + elif test $exit_code -gt 129 -a $exit_code -le 192; then
> + echo >&2 "test_must_fail: died by signal: $*"
> + return 1
> + fi
> + return 0
> }
Can the exit status (e.g. from a shell function) be negative?
Though your patch does not affect this, a command interrupted by a
signal will receive exit status > 192 in shells like ksh93. Posix
says:
As explained in other sections, certain exit status values
have been reserved for special uses and should be used by
applications only for those purposes:
126
A file to be executed was found, but it was not an
executable utility.
127
A utility to be executed was not found.
>128
A command was interrupted by a signal.
Unfortunately that does not agree with git usage.
129
Incorrect command-line usage, or help requested
(rather than SIGHUP).
255
Failed to create pipe for child process, fork
failed, execvp failed, wait failed, invalid
pathspec for add --patch, "git archive" or
"git daemon" failure (rather than signal 127).
Here's a test_might_fail patch for consistency.
-- 8< --
Subject: tests: make test_might_fail more verbose
Let test_might_fail say something about its failures for consistency
with test_must_fail.
Cc: Jeff King <peff@xxxxxxxx>
Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
---
t/test-lib.sh | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 285bfd8..506787c 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -615,7 +615,12 @@ test_must_fail () {
test_might_fail () {
"$@"
- test $? -ge 0 -a $? -le 129 -o $? -gt 192
+ exit_code=$?
+ if test $exit_code -gt 129 -a $exit_code -le 192; then
+ echo >&2 "test_might_fail: died by signal: $*"
+ return 1
+ fi
+ return 0
}
# test_cmp is a helper function to compare actual and expected output.
--
1.7.2.2
--
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