From: Jeff King <peff@peff.net>
To: Jon Seymour <jon.seymour@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: [PATCH 1/2] tests: make test_must_fail more verbose
Date: Tue, 31 Aug 2010 11:56:36 -0400 [thread overview]
Message-ID: <20100831155636.GA11530@sigill.intra.peff.net> (raw)
In-Reply-To: <20100831155457.GB11014@sigill.intra.peff.net>
Because test_must_fail fails when a command succeeds, the
command frequently does not produce any output (since, after
all, it thought it was succeeding). So let's have
test_must_fail itself report that a problem occurred.
Signed-off-by: Jeff King <peff@peff.net>
---
t/test-lib.sh | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 3a3d4c4..285bfd8 100644
--- 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
}
# Similar to test_must_fail, but tolerates success, too. This is
--
1.7.2.2.119.gf9c33
next prev parent reply other threads:[~2010-08-31 15:56 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 ` Jeff King [this message]
2010-08-31 17:10 ` [PATCH 1/2] tests: make test_must_fail more verbose Jonathan Nieder
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100831155636.GA11530@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jon.seymour@gmail.com \
/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.
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 NNTP newsgroup(s).