Re: [PATCHv5 08/16] t4019 (diff-wserror): add lots of missing &&

From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Oct 4, 2010, 02:52 UTC
Message-ID: <AANLkTinYGbAE6ymp-9nFN-OXe8-iL9=9Jkf7noDGQNg3@mail.gmail.com>
In-Reply-To: <20101003143211.GD17084@burratino>

On Sun, Oct 3, 2010 at 14:32, Jonathan Nieder <jrnieder@gmail.com> wrote:

Show 33 quoted lines

> Elijah Newren wrote:
>
>> --- a/t/t4019-diff-wserror.sh
>> +++ b/t/t4019-diff-wserror.sh
>> @@ -40,7 +40,7 @@ prepare_output () {
>>
>>  test_expect_success default '
>>
>> -     prepare_output
>> +     prepare_output &&
>
> As I asked before:
>
> The exit status from prepare_output is the exit status from its last
> command, which is "grep -v <something blue>".  It seems that never
> fails in these test cases, but should we be relying on that?
>
> So I would be more comfortable with the following on top.
>
> ---
> diff --git a/t/t4019-diff-wserror.sh b/t/t4019-diff-wserror.sh
> index 36f06c7..afd74c8 100755
> --- a/t/t4019-diff-wserror.sh
> +++ b/t/t4019-diff-wserror.sh
> @@ -36,6 +36,7 @@ prepare_output () {
>        git diff --color >output
>        $grep_a "$blue_grep" output >error
>        $grep_a -v "$blue_grep" output >normal
> +       return 0
>  }
>
>  test_expect_success default '
>

If we want to rely on that this would make more sense probably:

     prepare_output () {
    -       git diff --color >output
    -       $grep_a "$blue_grep" output >error
    +       git diff --color >output &&
    +       $grep_a "$blue_grep" output >error &&
            $grep_a -v "$blue_grep" output >normal
     }

But I don't know whether that makes sense.