From: Jonathan Nieder <jrnieder@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Jon Seymour <jon.seymour@gmail.com>,
git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH 1/2] tests: make test_must_fail more verbose
Date: Tue, 31 Aug 2010 12:10:55 -0500 [thread overview]
Message-ID: <20100831171055.GO2315@burratino> (raw)
In-Reply-To: <20100831155636.GA11530@sigill.intra.peff.net>
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@peff.net>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
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
next prev parent reply other threads:[~2010-08-31 17:12 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-31 14:49 [PATCH 0/2] fix quotes in maint-reflog-beyond-horizon and detached-stash Jon Seymour
2010-08-31 14:49 ` [PATCH 1/2] maint-reflog-beyond-horizon: fix broken test_must_fail calls Jon Seymour
2010-08-31 14:49 ` [PATCH 2/2] detached-stash: " Jon Seymour
2010-08-31 15:54 ` [PATCH 0/2] fix quotes in maint-reflog-beyond-horizon and detached-stash Jeff King
2010-08-31 15:56 ` [PATCH 1/2] tests: make test_must_fail more verbose Jeff King
2010-08-31 17:10 ` Jonathan Nieder [this message]
2010-08-31 18:06 ` Jeff King
2010-08-31 19:35 ` Jonathan Nieder
2010-09-01 3:37 ` Jon Seymour
2010-09-01 10:55 ` Ævar Arnfjörð Bjarmason
2010-08-31 15:56 ` [PATCH 2/2] tests: make test_must_fail fail on missing commands Jeff King
2010-08-31 16:58 ` Junio C Hamano
2010-08-31 17:25 ` Jeff King
2010-08-31 17:26 ` Jonathan Nieder
2010-08-31 18:08 ` Jeff King
2010-08-31 18:14 ` Ævar Arnfjörð Bjarmason
2010-08-31 17:03 ` [PATCH 0/2] fix quotes in maint-reflog-beyond-horizon and detached-stash Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100831171055.GO2315@burratino \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jon.seymour@gmail.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).