From: Junio C Hamano <gitster@pobox.com>
To: Denton Liu <liu.denton@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
David Aguilar <davvid@gmail.com>,
Jeff Hostetler <git@jeffhostetler.com>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [PATCH v3 1/6] t7610: unsuppress output
Date: Thu, 25 Apr 2019 11:31:41 +0900 [thread overview]
Message-ID: <xmqqftq6zugi.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <9f9922cab341396a846edc2f52342c59d294379a.1556142510.git.liu.denton@gmail.com> (Denton Liu's message of "Wed, 24 Apr 2019 15:46:57 -0700")
Denton Liu <liu.denton@gmail.com> writes:
> The output for commands used to be suppressed by redirecting both stdout
> and stderr to /dev/null. However, this should not happen since the
> output is useful for debugging and, without the "-v" flag, test scripts
> don't output anyway.
>
> Unsuppress the output by removing the redirections to /dev/null.
Thanks for clearly justifying the clean-up.
I take it that with this there is no behaviour changes (e.g. a
command that may change its behaviour depending on where its
standard output goes does not change the outcome of the tests)?
I am not worried about the invocations of "git mergetool" downstream
of the pipe that is fed by "yes", and the remainder are a handful of
"git merge" invocations, which looked OK to me.
Thanks.
> Signed-off-by: Denton Liu <liu.denton@gmail.com>
> ---
> t/t7610-mergetool.sh | 122 +++++++++++++++++++++----------------------
> 1 file changed, 61 insertions(+), 61 deletions(-)
>
> diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
> index a9fb971615..69711487dd 100755
> --- a/t/t7610-mergetool.sh
> +++ b/t/t7610-mergetool.sh
> @@ -130,14 +130,14 @@ test_expect_success 'custom mergetool' '
> test_when_finished "git reset --hard" &&
> git checkout -b test$test_count branch1 &&
> git submodule update -N &&
> - test_must_fail git merge master >/dev/null 2>&1 &&
> - ( yes "" | git mergetool both >/dev/null 2>&1 ) &&
> + test_must_fail git merge master &&
> + ( yes "" | git mergetool both ) &&
> ( yes "" | git mergetool file1 file1 ) &&
> - ( yes "" | git mergetool file2 "spaced name" >/dev/null 2>&1 ) &&
> - ( yes "" | git mergetool subdir/file3 >/dev/null 2>&1 ) &&
> - ( yes "d" | git mergetool file11 >/dev/null 2>&1 ) &&
> - ( yes "d" | git mergetool file12 >/dev/null 2>&1 ) &&
> - ( yes "l" | git mergetool submod >/dev/null 2>&1 ) &&
> + ( yes "" | git mergetool file2 "spaced name" ) &&
> + ( yes "" | git mergetool subdir/file3 ) &&
> + ( yes "d" | git mergetool file11 ) &&
> + ( yes "d" | git mergetool file12 ) &&
> + ( yes "l" | git mergetool submod ) &&
> test "$(cat file1)" = "master updated" &&
> test "$(cat file2)" = "master new" &&
> test "$(cat subdir/file3)" = "master new sub" &&
> @@ -153,15 +153,15 @@ test_expect_success 'mergetool crlf' '
> # test_when_finished is LIFO.)
> test_config core.autocrlf true &&
> git checkout -b test$test_count branch1 &&
> - test_must_fail git merge master >/dev/null 2>&1 &&
> - ( yes "" | git mergetool file1 >/dev/null 2>&1 ) &&
> - ( yes "" | git mergetool file2 >/dev/null 2>&1 ) &&
> - ( yes "" | git mergetool "spaced name" >/dev/null 2>&1 ) &&
> - ( yes "" | git mergetool both >/dev/null 2>&1 ) &&
> - ( yes "" | git mergetool subdir/file3 >/dev/null 2>&1 ) &&
> - ( yes "d" | git mergetool file11 >/dev/null 2>&1 ) &&
> - ( yes "d" | git mergetool file12 >/dev/null 2>&1 ) &&
> - ( yes "r" | git mergetool submod >/dev/null 2>&1 ) &&
> + test_must_fail git merge master &&
> + ( yes "" | git mergetool file1 ) &&
> + ( yes "" | git mergetool file2 ) &&
> + ( yes "" | git mergetool "spaced name" ) &&
> + ( yes "" | git mergetool both ) &&
> + ( yes "" | git mergetool subdir/file3 ) &&
> + ( yes "d" | git mergetool file11 ) &&
> + ( yes "d" | git mergetool file12 ) &&
> + ( yes "r" | git mergetool submod ) &&
> test "$(printf x | cat file1 -)" = "$(printf "master updated\r\nx")" &&
> test "$(printf x | cat file2 -)" = "$(printf "master new\r\nx")" &&
> test "$(printf x | cat subdir/file3 -)" = "$(printf "master new sub\r\nx")" &&
> @@ -176,8 +176,8 @@ test_expect_success 'mergetool in subdir' '
> git submodule update -N &&
> (
> cd subdir &&
> - test_must_fail git merge master >/dev/null 2>&1 &&
> - ( yes "" | git mergetool file3 >/dev/null 2>&1 ) &&
> + test_must_fail git merge master &&
> + ( yes "" | git mergetool file3 ) &&
> test "$(cat file3)" = "master new sub"
> )
> '
> @@ -188,14 +188,14 @@ test_expect_success 'mergetool on file in parent dir' '
> git submodule update -N &&
> (
> cd subdir &&
> - test_must_fail git merge master >/dev/null 2>&1 &&
> - ( yes "" | git mergetool file3 >/dev/null 2>&1 ) &&
> - ( yes "" | git mergetool ../file1 >/dev/null 2>&1 ) &&
> - ( yes "" | git mergetool ../file2 ../spaced\ name >/dev/null 2>&1 ) &&
> - ( yes "" | git mergetool ../both >/dev/null 2>&1 ) &&
> - ( yes "d" | git mergetool ../file11 >/dev/null 2>&1 ) &&
> - ( yes "d" | git mergetool ../file12 >/dev/null 2>&1 ) &&
> - ( yes "l" | git mergetool ../submod >/dev/null 2>&1 ) &&
> + test_must_fail git merge master &&
> + ( yes "" | git mergetool file3 ) &&
> + ( yes "" | git mergetool ../file1 ) &&
> + ( yes "" | git mergetool ../file2 ../spaced\ name ) &&
> + ( yes "" | git mergetool ../both ) &&
> + ( yes "d" | git mergetool ../file11 ) &&
> + ( yes "d" | git mergetool ../file12 ) &&
> + ( yes "l" | git mergetool ../submod ) &&
> test "$(cat ../file1)" = "master updated" &&
> test "$(cat ../file2)" = "master new" &&
> test "$(cat ../submod/bar)" = "branch1 submodule" &&
> @@ -209,9 +209,9 @@ test_expect_success 'mergetool skips autoresolved' '
> git submodule update -N &&
> test_must_fail git merge master &&
> test -n "$(git ls-files -u)" &&
> - ( yes "d" | git mergetool file11 >/dev/null 2>&1 ) &&
> - ( yes "d" | git mergetool file12 >/dev/null 2>&1 ) &&
> - ( yes "l" | git mergetool submod >/dev/null 2>&1 ) &&
> + ( yes "d" | git mergetool file11 ) &&
> + ( yes "d" | git mergetool file12 ) &&
> + ( yes "l" | git mergetool submod ) &&
> output="$(git mergetool --no-prompt)" &&
> test "$output" = "No files need merging"
> '
> @@ -259,9 +259,9 @@ test_expect_success 'mergetool skips resolved paths when rerere is active' '
> rm -rf .git/rr-cache &&
> git checkout -b test$test_count branch1 &&
> git submodule update -N &&
> - test_must_fail git merge master >/dev/null 2>&1 &&
> - ( yes "l" | git mergetool --no-prompt submod >/dev/null 2>&1 ) &&
> - ( yes "d" "d" | git mergetool --no-prompt >/dev/null 2>&1 ) &&
> + test_must_fail git merge master &&
> + ( yes "l" | git mergetool --no-prompt submod ) &&
> + ( yes "d" "d" | git mergetool --no-prompt ) &&
> git submodule update -N &&
> output="$(yes "n" | git mergetool --no-prompt)" &&
> test "$output" = "No files need merging"
> @@ -369,9 +369,9 @@ test_expect_success 'deleted vs modified submodule' '
> git checkout -b test$test_count.a test$test_count &&
> test_must_fail git merge master &&
> test -n "$(git ls-files -u)" &&
> - ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
> - ( yes "" | git mergetool both >/dev/null 2>&1 ) &&
> - ( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
> + ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 ) &&
> + ( yes "" | git mergetool both ) &&
> + ( yes "d" | git mergetool file11 file12 ) &&
> ( yes "r" | git mergetool submod ) &&
> rmdir submod && mv submod-movedaside submod &&
> test "$(cat submod/bar)" = "branch1 submodule" &&
> @@ -386,9 +386,9 @@ test_expect_success 'deleted vs modified submodule' '
> git submodule update -N &&
> test_must_fail git merge master &&
> test -n "$(git ls-files -u)" &&
> - ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
> - ( yes "" | git mergetool both >/dev/null 2>&1 ) &&
> - ( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
> + ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 ) &&
> + ( yes "" | git mergetool both ) &&
> + ( yes "d" | git mergetool file11 file12 ) &&
> ( yes "l" | git mergetool submod ) &&
> test ! -e submod &&
> output="$(git mergetool --no-prompt)" &&
> @@ -400,9 +400,9 @@ test_expect_success 'deleted vs modified submodule' '
> git submodule update -N &&
> test_must_fail git merge test$test_count &&
> test -n "$(git ls-files -u)" &&
> - ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
> - ( yes "" | git mergetool both >/dev/null 2>&1 ) &&
> - ( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
> + ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 ) &&
> + ( yes "" | git mergetool both ) &&
> + ( yes "d" | git mergetool file11 file12 ) &&
> ( yes "r" | git mergetool submod ) &&
> test ! -e submod &&
> test -d submod.orig &&
> @@ -416,9 +416,9 @@ test_expect_success 'deleted vs modified submodule' '
> git submodule update -N &&
> test_must_fail git merge test$test_count &&
> test -n "$(git ls-files -u)" &&
> - ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
> - ( yes "" | git mergetool both >/dev/null 2>&1 ) &&
> - ( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
> + ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 ) &&
> + ( yes "" | git mergetool both ) &&
> + ( yes "d" | git mergetool file11 file12 ) &&
> ( yes "l" | git mergetool submod ) &&
> test "$(cat submod/bar)" = "master submodule" &&
> git submodule update -N &&
> @@ -440,9 +440,9 @@ test_expect_success 'file vs modified submodule' '
> git checkout -b test$test_count.a branch1 &&
> test_must_fail git merge master &&
> test -n "$(git ls-files -u)" &&
> - ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
> - ( yes "" | git mergetool both >/dev/null 2>&1 ) &&
> - ( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
> + ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 ) &&
> + ( yes "" | git mergetool both ) &&
> + ( yes "d" | git mergetool file11 file12 ) &&
> ( yes "r" | git mergetool submod ) &&
> rmdir submod && mv submod-movedaside submod &&
> test "$(cat submod/bar)" = "branch1 submodule" &&
> @@ -456,9 +456,9 @@ test_expect_success 'file vs modified submodule' '
> git checkout -b test$test_count.b test$test_count &&
> test_must_fail git merge master &&
> test -n "$(git ls-files -u)" &&
> - ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
> - ( yes "" | git mergetool both >/dev/null 2>&1 ) &&
> - ( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
> + ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 ) &&
> + ( yes "" | git mergetool both ) &&
> + ( yes "d" | git mergetool file11 file12 ) &&
> ( yes "l" | git mergetool submod ) &&
> git submodule update -N &&
> test "$(cat submod)" = "not a submodule" &&
> @@ -472,9 +472,9 @@ test_expect_success 'file vs modified submodule' '
> git submodule update -N &&
> test_must_fail git merge test$test_count &&
> test -n "$(git ls-files -u)" &&
> - ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
> - ( yes "" | git mergetool both >/dev/null 2>&1 ) &&
> - ( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
> + ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 ) &&
> + ( yes "" | git mergetool both ) &&
> + ( yes "d" | git mergetool file11 file12 ) &&
> ( yes "r" | git mergetool submod ) &&
> test -d submod.orig &&
> git submodule update -N &&
> @@ -488,9 +488,9 @@ test_expect_success 'file vs modified submodule' '
> git submodule update -N &&
> test_must_fail git merge test$test_count &&
> test -n "$(git ls-files -u)" &&
> - ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 >/dev/null 2>&1 ) &&
> - ( yes "" | git mergetool both>/dev/null 2>&1 ) &&
> - ( yes "d" | git mergetool file11 file12 >/dev/null 2>&1 ) &&
> + ( yes "" | git mergetool file1 file2 spaced\ name subdir/file3 ) &&
> + ( yes "" | git mergetool both ) &&
> + ( yes "d" | git mergetool file11 file12 ) &&
> ( yes "l" | git mergetool submod ) &&
> test "$(cat submod/bar)" = "master submodule" &&
> git submodule update -N &&
> @@ -543,7 +543,7 @@ test_expect_success 'submodule in subdirectory' '
> git add subdir/subdir_module &&
> git commit -m "change submodule in subdirectory on test$test_count.b" &&
>
> - test_must_fail git merge test$test_count.a >/dev/null 2>&1 &&
> + test_must_fail git merge test$test_count.a &&
> (
> cd subdir &&
> ( yes "l" | git mergetool subdir_module )
> @@ -554,7 +554,7 @@ test_expect_success 'submodule in subdirectory' '
> git reset --hard &&
> git submodule update -N &&
>
> - test_must_fail git merge test$test_count.a >/dev/null 2>&1 &&
> + test_must_fail git merge test$test_count.a &&
> ( yes "r" | git mergetool subdir/subdir_module ) &&
> test "$(cat subdir/subdir_module/file15)" = "test$test_count.b" &&
> git submodule update -N &&
> @@ -641,7 +641,7 @@ test_expect_success 'filenames seen by tools start with ./' '
> test_config mergetool.myecho.trustExitCode true &&
> test_must_fail git merge master &&
> git mergetool --no-prompt --tool myecho -- both >actual &&
> - grep ^\./both_LOCAL_ actual >/dev/null
> + grep ^\./both_LOCAL_ actual
> '
>
> test_lazy_prereq MKTEMP '
> @@ -658,8 +658,8 @@ test_expect_success MKTEMP 'temporary filenames are used with mergetool.writeToT
> test_config mergetool.myecho.trustExitCode true &&
> test_must_fail git merge master &&
> git mergetool --no-prompt --tool myecho -- both >actual &&
> - ! grep ^\./both_LOCAL_ actual >/dev/null &&
> - grep /both_LOCAL_ actual >/dev/null
> + ! grep ^\./both_LOCAL_ actual &&
> + grep /both_LOCAL_ actual
> '
>
> test_expect_success 'diff.orderFile configuration is honored' '
next prev parent reply other threads:[~2019-04-25 2:36 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-22 5:07 [PATCH 0/5] difftool and mergetool improvements Denton Liu
2019-04-22 5:07 ` [PATCH 1/5] t7610: add mergetool --gui tests Denton Liu
2019-04-22 5:07 ` [PATCH 2/5] mergetool: use get_merge_tool function Denton Liu
2019-04-22 7:07 ` Eric Sunshine
2019-04-22 8:35 ` Denton Liu
2019-04-22 5:07 ` [PATCH 3/5] mergetool: fallback to tool when guitool unavailable Denton Liu
2019-04-22 5:07 ` [PATCH 4/5] difftool: make --gui, --tool and --extcmd exclusive Denton Liu
2019-04-22 7:03 ` Eric Sunshine
2019-04-22 5:07 ` [PATCH 5/5] difftool: fallback on merge.guitool Denton Liu
2019-04-22 18:18 ` Jeff Hostetler
2019-04-22 18:33 ` Denton Liu
2019-04-23 8:53 ` [PATCH v2 0/5] difftool and mergetool improvements Denton Liu
2019-04-23 8:53 ` [PATCH v2 1/5] t7610: add mergetool --gui tests Denton Liu
2019-04-24 7:07 ` Junio C Hamano
2019-04-23 8:54 ` [PATCH v2 2/5] mergetool: use get_merge_tool_guessed function Denton Liu
2019-04-24 7:27 ` Junio C Hamano
2019-04-23 8:54 ` [PATCH v2 3/5] mergetool: fallback to tool when guitool unavailable Denton Liu
2019-04-23 8:54 ` [PATCH v2 4/5] difftool: make --gui, --tool and --extcmd mutually exclusive Denton Liu
2019-04-23 8:54 ` [PATCH v2 5/5] difftool: fallback on merge.guitool Denton Liu
2019-04-24 22:46 ` [PATCH v3 0/6] difftool and mergetool improvements Denton Liu
2019-04-24 22:46 ` [PATCH v3 1/6] t7610: unsuppress output Denton Liu
2019-04-25 2:31 ` Junio C Hamano [this message]
2019-04-24 22:46 ` [PATCH v3 2/6] t7610: add mergetool --gui tests Denton Liu
2019-04-24 22:47 ` [PATCH v3 3/6] mergetool: use get_merge_tool function Denton Liu
2019-04-25 2:36 ` Junio C Hamano
2019-04-24 22:47 ` [PATCH v3 4/6] mergetool: fallback to tool when guitool unavailable Denton Liu
2019-04-25 3:02 ` Junio C Hamano
2019-04-25 5:16 ` Denton Liu
2019-04-24 22:47 ` [PATCH v3 5/6] difftool: make --gui, --tool and --extcmd mutually exclusive Denton Liu
2019-04-24 22:47 ` [PATCH v3 6/6] difftool: fallback on merge.guitool Denton Liu
2019-04-25 3:10 ` Junio C Hamano
2019-04-25 9:54 ` [PATCH v4 0/6] difftool and mergetool improvements Denton Liu
2019-04-25 9:54 ` [PATCH v4 1/6] t7610: unsuppress output Denton Liu
2019-04-25 9:54 ` [PATCH v4 2/6] t7610: add mergetool --gui tests Denton Liu
2019-04-25 9:54 ` [PATCH v4 3/6] mergetool: use get_merge_tool function Denton Liu
2019-04-28 23:52 ` David Aguilar
2019-04-25 9:54 ` [PATCH v4 4/6] mergetool: fallback to tool when guitool unavailable Denton Liu
2019-04-28 23:56 ` David Aguilar
2019-04-25 9:54 ` [PATCH v4 5/6] difftool: make --gui, --tool and --extcmd mutually exclusive Denton Liu
2019-04-25 9:54 ` [PATCH v4 6/6] difftool: fallback on merge.guitool Denton Liu
2019-04-29 6:20 ` [PATCH v5 0/7] difftool and mergetool improvements Denton Liu
2019-04-29 6:21 ` [PATCH v5 1/7] t7610: unsuppress output Denton Liu
2019-04-29 6:21 ` [PATCH v5 2/7] t7610: add mergetool --gui tests Denton Liu
2019-04-29 6:21 ` [PATCH v5 3/7] mergetool: use get_merge_tool function Denton Liu
2019-04-29 6:21 ` [PATCH v5 4/7] mergetool--lib: create gui_mode function Denton Liu
2019-04-29 6:21 ` [PATCH v5 5/7] mergetool: fallback to tool when guitool unavailable Denton Liu
2019-04-29 6:21 ` [PATCH v5 6/7] difftool: make --gui, --tool and --extcmd mutually exclusive Denton Liu
2019-04-29 6:21 ` [PATCH v5 7/7] difftool: fallback on merge.guitool Denton Liu
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=xmqqftq6zugi.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=davvid@gmail.com \
--cc=git@jeffhostetler.com \
--cc=git@vger.kernel.org \
--cc=liu.denton@gmail.com \
--cc=sunshine@sunshineco.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).