From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: "SZEDER Gábor" <szeder.dev@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH 2/3] t: teach 'test_must_fail' to save the command's stderr to a file
Date: Fri, 9 Feb 2018 14:03:30 -0500 [thread overview]
Message-ID: <20180209190329.GA15005@sigill.intra.peff.net> (raw)
In-Reply-To: <20180209185710.GA23403@sigill.intra.peff.net>
On Fri, Feb 09, 2018 at 01:57:10PM -0500, Jeff King wrote:
> Here's what it looks like as a patch.
>
> -- >8 --
> Subject: [PATCH] t: send verbose test-helper output to fd 4
That applies on 'master'. If we go this route, we'd want this on
sg/test-i18ngrep, which is in 'next' right now:
-- >8 --
Subject: [PATCH] test_i18n_grep: send error messages to fd 4
These were newly added in 63b1a175ee (t: make
'test_i18ngrep' more informative on failure, 2018-02-08),
and so missed the conversion in commit X.
Signed-off-by: Jeff King <peff@peff.net>
---
(The X above is whatever you queue the original at).
t/test-lib-functions.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index cddddd2082..aabee13e5d 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -742,18 +742,18 @@ test_i18ngrep () {
shift
! grep "$@" && return 0
- echo >&2 "error: '! grep $@' did find a match in:"
+ echo >&4 "error: '! grep $@' did find a match in:"
else
grep "$@" && return 0
- echo >&2 "error: 'grep $@' didn't find a match in:"
+ echo >&4 "error: 'grep $@' didn't find a match in:"
fi
if test -s "$last_arg"
then
- cat >&2 "$last_arg"
+ cat >&4 "$last_arg"
else
- echo >&2 "<File '$last_arg' is empty>"
+ echo >&4 "<File '$last_arg' is empty>"
fi
return 1
--
2.16.1.464.gc4bae515b7
next prev parent reply other threads:[~2018-02-09 19:03 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-09 2:42 [PATCH 0/3] Teach 'test_must_fail' to save the command's stderr to a file SZEDER Gábor
2018-02-09 2:42 ` [PATCH 1/3] t: document 'test_must_fail ok=<signal-name>' SZEDER Gábor
2018-02-09 2:42 ` [PATCH 2/3] t: teach 'test_must_fail' to save the command's stderr to a file SZEDER Gábor
2018-02-09 3:11 ` Eric Sunshine
2018-02-09 14:21 ` Jeff King
2018-02-09 18:36 ` Junio C Hamano
2018-02-09 18:57 ` Jeff King
2018-02-09 19:03 ` Jeff King [this message]
2018-02-23 23:26 ` SZEDER Gábor
2018-02-09 2:42 ` [PATCH 3/3] t1404: use 'test_must_fail stderr=<file>' SZEDER Gábor
2018-02-09 3:16 ` Eric Sunshine
2018-02-09 3:33 ` SZEDER Gábor
2018-02-09 18:22 ` 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=20180209190329.GA15005@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=szeder.dev@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.
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).