Re: [PATCH 21/25] t5000-t5999: fix broken &&-chains

From: SZEDER Gábor <szeder.dev@gmail.com>
Date: Jul 17, 2018, 08:15 UTC
Message-ID: <CAM0VKj=_5s40Z=8gRuRt__s74uSGa5wxy_+hDdAZhu8cRCC_Ew@mail.gmail.com>
In-Reply-To: <xmqq8t6gxpxb.fsf@gitster-ct.c.googlers.com>

On Thu, Jul 12, 2018 at 8:35 PM Junio C Hamano <gitster@pobox.com> wrote:

Show 31 quoted lines

>
> Junio C Hamano <gitster@pobox.com> writes:
>
> > Eric Sunshine <sunshine@sunshineco.com> writes:
> >
> >> On Thu, Jul 12, 2018 at 8:37 AM SZEDER Gábor <szeder.dev@gmail.com> wrote:
> >>> The change below should be squashed into this patch to fix a
> >>> previously unnoticed broken &&-chain.  I think you missed it, because
> >>> this test script is rather expensive and you didn't run it with
> >>> GIT_TEST_CLONE_2GB=YesPlease.
> >>>
> >>> diff --git a/t/t5608-clone-2gb.sh b/t/t5608-clone-2gb.sh
> >>> @@ -23,7 +23,7 @@ test_expect_success CLONE_2GB 'setup' '
> >>> -               echo "M 100644 :$i $i" >> commit
> >>> +               echo "M 100644 :$i $i" >> commit &&
> >>
> >> Thanks for finding this. I tried to get as much coverage as possible
> >> by installing packages I don't normally have installed (Apache, cvs,
> >> cvsps, Subversion, Perforce, etc.) and even temporarily modified a
> >> script or two to force it run ...
> >
> > Thanks, both.  I think the &&-chain fix series is already large and
> > also otherwise seem to be pretty solid, so let's not reroll but
> > queue this addition on top.
>
> Oops, sent before completing the message.
>
>         For that to happen, we need a sign-off ;-)
>
> I guess this one would have been caught with the "sed script on
> subshell" linter that does not execute?

It was in fact caught by Eric's linter (Travis CI runs these expensive tests, too), so I think it would be more appropriate to give him the credit.

Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>

Show 25 quoted lines

> -- >8 --
> Subject: t5608: fix broken &&-chain
>
> This is inside a loop that is run inside a subshell, in a test that
> is protected with CLONE_2GB prerequisite, one or more which is quite
> likely reason why it wasn't caught durin the previous clean-up.
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
>  t/t5608-clone-2gb.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/t/t5608-clone-2gb.sh b/t/t5608-clone-2gb.sh
> index df822d9a3e..2c6bc07344 100755
> --- a/t/t5608-clone-2gb.sh
> +++ b/t/t5608-clone-2gb.sh
> @@ -23,7 +23,7 @@ test_expect_success CLONE_2GB 'setup' '
>                 printf "blob\nmark :$i\ndata $blobsize\n" &&
>                 #test-tool genrandom $i $blobsize &&
>                 printf "%-${blobsize}s" $i &&
> -               echo "M 100644 :$i $i" >> commit
> +               echo "M 100644 :$i $i" >> commit &&
>                 i=$(($i+1)) ||
>                 echo $? > exit-status
>          done &&