Re: [PATCH] t7006: clean up SIGPIPE handling in trace2 tests
- From
Jeff King <peff@peff.net>
- Date
- Nov 21, 2021, 23:10 UTC
- Message-ID
- <YZrSALOrdhuunHwp@coredump.intra.peff.net>
- In-Reply-To
- <YZrOLy03s5ZWMQ+t@coredump.intra.peff.net>
On Sun, Nov 21, 2021 at 05:54:39PM -0500, Jeff King wrote:
Show 12 quoted lines
> That's actually pretty easy to do. So I came up with the patch below, in > the interests of wrapping up this thread. > > I'm not 100% sure this fixes any possible races, as the race Junio > initially reported seemed to be in the "propagated signals from pager" > test, which I don't think has these flaky-SIGPIPE problems. But I think > it's at least correcting some of the confusion. And we can see if it > happens again (I haven't been able to trigger any failures with --stress > myself). > > -- >8 -- > Subject: [PATCH] t7006: clean up SIGPIPE handling in trace2 tests
This one is optional on top. It's just cleanup, but IMHO makes it easier to understand what's going on.
-- >8 -- Subject: [PATCH] t7006: simplify exit-code checks for sigpipe tests
Some tests in t7006 check for a SIGPIPE result by recording $? and comparing it with test_match_signal. Before the previous commit, the command was on the left-hand side of a pipe, and so we had to do some subshell trickery to extract it.
But now that this is no longer the case, we can do things much more simply: just run the command directly, using braces to avoid wrecking the &&-chain, and then record $?. We could almost use test_expect_code here, but it doesn't know about test_match_signal.
Likewise, for tests which expect success (i.e., not SIGPIPE), we can just put them in the &&-chain as usual. That even lets us get rid of the !MINGW check, since the expectation is the same on both sides.
Signed-off-by: Jeff King <peff@peff.net> --- t/t7006-pager.sh | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-)
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh index 577e51b47a..851961c798 100755 --- a/t/t7006-pager.sh +++ b/t/t7006-pager.sh @@ -677,7 +677,7 @@ test_expect_success TTY 'git returns SIGPIPE on early pager exit' ' if test_have_prereq !MINGW then - OUT=$( ((test_terminal git log; echo $? 1>&3) >/dev/null) 3>&1 ) && + { test_terminal git log >/dev/null; OUT=$?; } && test_match_signal 13 "$OUT" else test_terminal git log @@ -698,7 +698,7 @@ test_expect_success TTY 'git returns SIGPIPE on early pager non-zero exit' ' if test_have_prereq !MINGW then - OUT=$( ((test_terminal git log; echo $? 1>&3) >/dev/null) 3>&1 ) && + { test_terminal git log >/dev/null; OUT=$?; } && test_match_signal 13 "$OUT" else test_terminal git log @@ -717,13 +717,7 @@ test_expect_success TTY 'git discards pager non-zero exit without SIGPIPE' ' export GIT_TRACE2 && test_when_finished "unset GIT_TRACE2" && - if test_have_prereq !MINGW - then - OUT=$( ((test_terminal git log; echo $? 1>&3) >/dev/null) 3>&1 ) && - test "$OUT" -eq 0 - else - test_terminal git log - fi && + test_terminal git log && grep child_exit trace.normal >child-exits && test_line_count = 1 child-exits && @@ -738,13 +732,7 @@ test_expect_success TTY 'git skips paging nonexisting command' ' export GIT_TRACE2 && test_when_finished "unset GIT_TRACE2" && - if test_have_prereq !MINGW - then - OUT=$( ((test_terminal git log; echo $? 1>&3) >/dev/null) 3>&1 ) && - test "$OUT" -eq 0 - else - test_terminal git log - fi && + test_terminal git log && grep child_exit trace.normal >child-exits && test_line_count = 1 child-exits && @@ -760,7 +748,7 @@ test_expect_success TTY 'git returns SIGPIPE on propagated signals from pager' ' if test_have_prereq !MINGW then - OUT=$( ((test_terminal git log; echo $? 1>&3) >/dev/null) 3>&1 ) && + { test_terminal git log >/dev/null; OUT=$?; } && test_match_signal 13 "$OUT" else test_terminal git log
-- 2.34.0.636.g3d595567a1