Re: [PATCH 12/25] t7810: use test_expect_code() instead of hand-rolled comparison

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Jul 2, 2018, 21:12 UTC
Message-ID: <CAPig+cTr_nCYkGn6DVtODOa+ufsr4V006FmdvqL63PzvpARvUA@mail.gmail.com>
In-Reply-To: <CAGZ79kZFSAe1NL3EVKtbSm6E9PvhajWdrrbwDNMm2K5FRH7m-Q@mail.gmail.com>

On Mon, Jul 2, 2018 at 2:14 PM Stefan Beller <sbeller@google.com> wrote:

Show 19 quoted lines

> On Sun, Jul 1, 2018 at 5:25 PM Eric Sunshine <sunshine@sunshineco.com> wrote:
> >  test_expect_success 'grep from a subdirectory to search wider area (2)' '
> >         mkdir -p s &&
> >         (
> > -               cd s || exit 1
> > -               ( git grep xxyyzz .. >out ; echo $? >status )
> > -               ! test -s out &&
> > -               test 1 = $(cat status)
> > +               cd s &&
> > +               test_expect_code 1 git grep xxyyzz .. >out &&
> > +               ! test -s out
> >         )
>
> Further optimisation would be possible if I understand the code correctly:
>
>     test_expect_code git -C s grep xxyyzz .. >../out
>     test_must_be_empty out
>
> (dropping the subshell entirely)

I did consider dropping the subshell in favor of -C, however, decided to keep it since the subshell has value by making it very explicit to the reader that this git-grep command is running in a subdirectory (which is what this test is all about). Contrast that with -C which is easy to overlook and might not fully convince the reader that the command's entire execution is within the subdirectory, whereas there is no question that the entire execution of git-diff in "(cd s && git-diff ...)" occurs in the subdirectory.

I can make the test_must_be_empty() change if I re-roll.