From: Phillip Wood <phillip.wood123@gmail.com>
To: Emily Shaffer <emilyshaffer@google.com>, git@vger.kernel.org
Subject: Re: [RFC PATCH v2 3/4] t7006-pager.sh: more lenient trace checking
Date: Fri, 23 Apr 2021 13:45:07 +0100 [thread overview]
Message-ID: <27d2ffe7-6f5b-726e-eed0-438a4efb8f9f@gmail.com> (raw)
In-Reply-To: <f4c3688e-8316-7f66-3bcb-d8aaeef3a7d3@gmail.com>
Hi Emily
On 23/04/2021 10:54, Phillip Wood wrote:
> Hi Emily
> [...]
>> diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
>> index 0e7cf75435..ac2d91d56b 100755
>> --- a/t/t7006-pager.sh
>> +++ b/t/t7006-pager.sh
>> @@ -676,7 +676,9 @@ test_expect_success TTY 'git returns SIGPIPE on
>> early pager exit' '
>> test_terminal git log
>> fi &&
>> - grep child_exit trace.normal >child-exits &&
>> + PAGER_CHILD_ID=$(grep pager-used trace.normal | \
>> + sed -n "s/child_start\[\([0-9]\+\)\].*/\1/p") &&
>
> If you want to save a process you could use sed to do the job of the
> grep command. I think this should do it
>
> sed -n -e "/child_exit/ {" -e "s/child_start\[\([0-9]\+\)\].*/\1/p" -e "}"
I must have been half asleep when I wrote that, there is no need for the
braces and the initial match is wrong it should be
sed -n "/pager-used/s/child_start\[\([0-9]\+\)\].*/\1/p"
Best Wishes
Phillip
>> + grep -F "child_exit["$PAGER_CHILD_ID"]" trace.normal >child-exits &&
>
> Why is $PAGER_CHILD_ID unquoted?
>
> Best Wishes
>
> Phillip
>
>> test_line_count = 1 child-exits &&
>> grep " code:0 " child-exits &&
>> test_path_is_file pager-used
>> @@ -697,7 +699,9 @@ test_expect_success TTY 'git returns SIGPIPE on
>> early pager non-zero exit' '
>> test_terminal git log
>> fi &&
>> - grep child_exit trace.normal >child-exits &&
>> + PAGER_CHILD_ID=$(grep pager-used trace.normal | \
>> + sed -n "s/child_start\[\([0-9]\+\)\].*/\1/p") &&
>> + grep -F "child_exit["$PAGER_CHILD_ID"]" trace.normal >child-exits &&
>> test_line_count = 1 child-exits &&
>> grep " code:1 " child-exits &&
>> test_path_is_file pager-used
>> @@ -718,7 +722,9 @@ test_expect_success TTY 'git discards pager
>> non-zero exit without SIGPIPE' '
>> test_terminal git log
>> fi &&
>> - grep child_exit trace.normal >child-exits &&
>> + PAGER_CHILD_ID=$(grep pager-used trace.normal | \
>> + sed -n "s/child_start\[\([0-9]\+\)\].*/\1/p") &&
>> + grep -F "child_exit["$PAGER_CHILD_ID"]" trace.normal >child-exits &&
>> test_line_count = 1 child-exits &&
>> grep " code:1 " child-exits &&
>> test_path_is_file pager-used
>> @@ -739,7 +745,9 @@ test_expect_success TTY 'git discards nonexisting
>> pager without SIGPIPE' '
>> test_terminal git log
>> fi &&
>> - grep child_exit trace.normal >child-exits &&
>> + PAGER_CHILD_ID=$(grep does-not-exist trace.normal | \
>> + sed -n "s/child_start\[\([0-9]\+\)\].*/\1/p") &&
>> + grep -F "child_exit["$PAGER_CHILD_ID"]" trace.normal >child-exits &&
>> test_line_count = 1 child-exits &&
>> grep " code:127 " child-exits &&
>> test_path_is_file pager-used
>> @@ -760,7 +768,9 @@ test_expect_success TTY 'git attempts to page to
>> nonexisting pager command, gets
>> test_terminal git log
>> fi &&
>> - grep child_exit trace.normal >child-exits &&
>> + PAGER_CHILD_ID=$(grep does-not-exist trace.normal | \
>> + sed -n "s/child_start\[\([0-9]\+\)\].*/\1/p") &&
>> + grep -F "child_exit["$PAGER_CHILD_ID"]" trace.normal >child-exits &&
>> test_line_count = 1 child-exits &&
>> grep " code:-1 " child-exits
>> '
>> @@ -780,7 +790,9 @@ test_expect_success TTY 'git returns SIGPIPE on
>> propagated signals from pager' '
>> test_terminal git log
>> fi &&
>> - grep child_exit trace.normal >child-exits &&
>> + PAGER_CHILD_ID=$(grep pager-used trace.normal | \
>> + sed -n "s/child_start\[\([0-9]\+\)\].*/\1/p") &&
>> + grep -F "child_exit["$PAGER_CHILD_ID"]" trace.normal >child-exits &&
>> test_line_count = 1 child-exits &&
>> grep " code:143 " child-exits &&
>> test_path_is_file pager-used
>>
>
next prev parent reply other threads:[~2021-04-23 12:45 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-08 23:39 [RFC PATCH 0/2] share a config between submodule and superproject Emily Shaffer
2021-04-08 23:39 ` [RFC PATCH 1/2] config: rename "submodule" scope to "gitmodules" Emily Shaffer
2021-04-08 23:39 ` [RFC PATCH 2/2] config: add 'config.superproject' file Emily Shaffer
2021-04-09 11:10 ` Philip Oakley
2021-04-13 18:05 ` Emily Shaffer
2021-04-09 14:35 ` Matheus Tavares Bernardino
2021-04-09 22:29 ` Junio C Hamano
2021-04-13 19:45 ` Emily Shaffer
2021-04-13 18:48 ` Emily Shaffer
2021-04-14 10:32 ` Future structure of submodules and .git/, .git/modules/* organization Ævar Arnfjörð Bjarmason
2021-04-15 21:25 ` Emily Shaffer
2021-04-15 21:41 ` Junio C Hamano
2021-04-23 0:15 ` [RFC PATCH v2 0/4] share a config between submodule and superproject Emily Shaffer
2021-04-23 0:15 ` [RFC PATCH v2 1/4] config: rename "submodule" scope to "gitmodules" Emily Shaffer
2021-04-23 9:46 ` Phillip Wood
2021-04-23 0:15 ` [RFC PATCH v2 2/4] t1510-repo-setup: don't use exact matching on traces Emily Shaffer
2021-04-23 9:59 ` Phillip Wood
2021-04-23 0:15 ` [RFC PATCH v2 3/4] t7006-pager.sh: more lenient trace checking Emily Shaffer
2021-04-23 9:54 ` Phillip Wood
2021-04-23 12:45 ` Phillip Wood [this message]
2021-04-23 0:15 ` [RFC PATCH v2 4/4] config: add 'config.superproject' file Emily Shaffer
2021-04-23 12:08 ` Johannes Schindelin
2021-06-19 0:31 ` [PATCH v3 0/2] share a config between submodule and superproject Emily Shaffer
2021-06-19 0:31 ` [PATCH v3 1/2] config: rename "submodule" scope to "gitmodules" Emily Shaffer
2021-06-19 0:31 ` [PATCH v3 2/2] config: add 'config.superproject' file Emily Shaffer
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=27d2ffe7-6f5b-726e-eed0-438a4efb8f9f@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=emilyshaffer@google.com \
--cc=git@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.