Re: [PATCH] tests: use test_cmp instead of piping to diff(1)
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Sep 15, 2010, 23:15 UTC
- Message-ID
- <AANLkTimpV20yGKw57raxho-8zSymLEvXgXSAayEmb7M9@mail.gmail.com>
- In-Reply-To
- <4C90029F.6020909@web.de>
On Tue, Sep 14, 2010 at 23:17, Jens Lehmann <Jens.Lehmann@web.de> wrote:
Show 27 quoted lines
> Am 14.09.2010 03:45, schrieb Ævar Arnfjörð Bjarmason: >> On Mon, Sep 13, 2010 at 23:31, Junio C Hamano <gitster@pobox.com> wrote: >>> Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes: >>> >>>> @@ -37,9 +37,10 @@ head1=$(add_file sm1 foo1 foo2) >>>> test_expect_success 'added submodule' " >>>> git add sm1 && >>>> git diff-index -p --submodule=log HEAD >actual && >>>> - diff actual - <<-EOF >>>> + cat >expected <<-EOF && >>>> Submodule sm1 0000000...$head1 (new submodule) >>>> EOF >>>> + test_cmp expected actual >>>> " >>> >>> Nit. Did you really mean <<-EOF, not <<EOF, here, especially you are >>> writing the here document without indentation with any TAB? >> >> I just meant to replace the diff invocations with test_cmp. Changing >> the surrounding here-docs was outside the scope of the patch. > > I plead guilty for introducing the "<<-EOF"s in the first place by > simply copying the frame for this test from t7401. But me too thinks > the "test_cmp" should have TABs in front of them instead of spaces. > > With the "TAB in front of test_cmp" issue fixed you may add: > Acked-by: Jens Lehmann <Jens.Lehmann@web.de>
Junio, since you picked this up as part of the ab/i18n branch I fixed this issue up there. You can pull it from the usual place (git://github.com/avar/git.git ab/i18n).
I didn't switch to TAB in all cases, but only the ones where the surrounding test code already used TAB. t4041-diff-submodule-option.sh uses TAB for indent, but t7401-submodule-summary.sh does not, this way my patch retains the indentation of the surrounding code.
(I didn't add Jens's Acked-by to the patch since I didn't strictly do what he was suggesting).