Re: [PATCH 2/3] t: teach 'test_must_fail' to save the command's stderr to a file
- From
Jeff King <peff@peff.net>
- Date
- Feb 9, 2018, 19:03 UTC
- Message-ID
- <20180209190329.GA15005@sigill.intra.peff.net>
- 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