From: Vasco Almeida <vascomalmeida@sapo.pt>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: "Git List" <git@vger.kernel.org>,
"Jiang Xin" <worldhello.net@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: [PATCH 19/21] t9003: become resilient to GETTEXT_POISON
Date: Thu, 19 May 2016 21:31:52 +0000 [thread overview]
Message-ID: <573E30C8.4070600@sapo.pt> (raw)
In-Reply-To: <CAPig+cT3yf7D4xOmOhy5Y21qwHuA5Ny9ULEJhC1OBgrhiayQ3g@mail.gmail.com>
Às 18:34 de 19-05-2016, Eric Sunshine escreveu:
> On Wed, May 18, 2016 at 11:27 AM, Vasco Almeida <vascomalmeida@sapo.pt> wrote:
>> The test t9003-help-autocorrect.sh fails when run under GETTEXT_POISON,
>> because it's expecting to filter out the original output. Accommodate
>> gettext poison case by also filtering out the default simulated output.
>>
>> Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
>> ---
>> diff --git a/t/t9003-help-autocorrect.sh b/t/t9003-help-autocorrect.sh
>> @@ -31,10 +31,14 @@ test_expect_success 'autocorrect showing candidates' '
>> git config help.autocorrect 0 &&
>>
>> test_must_fail git lfg 2>actual &&
>> - sed -e "1,/^Did you mean this/d" actual | grep lgf &&
>> + sed -e "1,/^Did you mean this/d" actual |
>> + sed -e "/GETTEXT POISON/d" actual |
>
> Why not do so with a single sed invocation?
>
> sed -e "..." -e "..." |
>
>> + grep lgf &&
>>
>> test_must_fail git distimdist 2>actual &&
>> - sed -e "1,/^Did you mean this/d" actual | grep distimdistim
>> + sed -e "1,/^Did you mean this/d" actual |
>> + sed -e "/GETTEXT POISON/d" actual |
>
> Ditto.
>
>> + grep distimdistim
>> '
I tried but it seems not to work.
Actually I did this wrong, I haven't thought this through.
Under gettext poison:
sed -e "1,/^Did you mean this/d" removes all lines, gives no output.
And then the one second, sed -e "/GETTEXT POISON/d", outputs "lgf" as
expected.
But running normally (without gettext poison):
1st sed outputs "lgf" as expected
And then second one output the entire 'actual' file, like if it were
cat, undoing the first sed.
I think the sed here is superfluous in the first place.
Should we remove it? If it weren't the case of gettext poison it was ok
to have sed there, but it makes the test fail under gettext poison.
next prev parent reply other threads:[~2016-05-19 21:32 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-18 15:27 [PATCH 00/21] i18n and tests updates Vasco Almeida
2016-05-18 15:27 ` [PATCH 01/21] i18n: builtin/remote.c: fix mark for translation Vasco Almeida
2016-05-18 15:27 ` [PATCH 02/21] i18n: advice: mark string about detached head " Vasco Almeida
2016-05-18 15:27 ` [PATCH 03/21] i18n: advice: internationalize message for conflicts Vasco Almeida
2016-05-18 19:24 ` Eric Sunshine
2016-05-18 21:00 ` Vasco Almeida
2016-05-18 21:31 ` Junio C Hamano
2016-05-18 15:27 ` [PATCH 04/21] i18n: transport: mark strings for translation Vasco Almeida
2016-05-18 15:27 ` [PATCH 05/21] i18n: sequencer: mark entire sentences " Vasco Almeida
2016-05-18 19:28 ` Eric Sunshine
2016-05-18 21:02 ` Vasco Almeida
2016-05-21 13:15 ` Ævar Arnfjörð Bjarmason
2016-05-23 0:44 ` Junio C Hamano
2016-05-23 1:00 ` Eric Sunshine
2016-05-18 15:27 ` [PATCH 06/21] i18n: sequencer: mark string " Vasco Almeida
2016-05-18 15:27 ` [PATCH 07/21] i18n: merge-octopus: mark messages " Vasco Almeida
2016-05-18 15:27 ` [PATCH 08/21] merge-octupus: use die shell function from git-sh-setup.sh Vasco Almeida
2016-05-18 15:27 ` [PATCH 09/21] i18n: rebase: fix marked string to use eval_gettext variant Vasco Almeida
2016-05-18 15:27 ` [PATCH 10/21] i18n: rebase: mark placeholder for translation Vasco Almeida
2016-05-18 15:27 ` [PATCH 11/21] i18n: bisect: simplify error message for i18n Vasco Almeida
2016-05-18 15:27 ` [PATCH 12/21] t6030: update to use test_i18ncmp Vasco Almeida
2016-05-18 15:27 ` [PATCH 13/21] i18n: git-sh-setup.sh: mark strings for translation Vasco Almeida
2016-05-18 15:27 ` [PATCH 14/21] i18n: rebase-interactive: " Vasco Almeida
2016-05-19 17:49 ` Eric Sunshine
2016-05-21 12:57 ` Ævar Arnfjörð Bjarmason
2016-05-21 14:05 ` Vasco Almeida
2016-05-18 15:27 ` [PATCH 15/21] i18n: rebase-interactive: mark here-doc " Vasco Almeida
2016-05-18 15:27 ` [PATCH 16/21] i18n: rebase-interactive: mark comments of squash " Vasco Almeida
2016-05-18 15:27 ` [PATCH 17/21] tests: use test_i18n* functions to suppress false positives Vasco Almeida
2016-05-18 15:27 ` [PATCH 18/21] tests: unpack-trees: update to use test_i18n* functions Vasco Almeida
2016-05-18 15:27 ` [PATCH 19/21] t9003: become resilient to GETTEXT_POISON Vasco Almeida
2016-05-19 18:34 ` Eric Sunshine
2016-05-19 21:31 ` Vasco Almeida [this message]
2016-05-20 3:30 ` Eric Sunshine
2016-05-20 16:39 ` Junio C Hamano
2016-05-20 17:22 ` Eric Sunshine
2016-05-20 17:39 ` Vasco Almeida
2016-05-20 17:50 ` Junio C Hamano
2016-05-20 17:59 ` Junio C Hamano
2016-05-20 18:21 ` Vasco Almeida
2016-05-18 15:27 ` [PATCH 20/21] t4153: fix negated test_i18ngrep call Vasco Almeida
2016-05-18 15:27 ` [PATCH 21/21] t5523: use test_i18ngrep for negation Vasco Almeida
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=573E30C8.4070600@sapo.pt \
--to=vascomalmeida@sapo.pt \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=sunshine@sunshineco.com \
--cc=worldhello.net@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.
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.