Re: [PATCH 2/2] merge-recursive: fix merging a subdirectory into the root directory

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Oct 30, 2019, 22:16 UTC
Message-ID: <nycvar.QRO.7.76.6.1910302315000.46@tvgsbejvaqbjf.bet>
In-Reply-To: <CABPp-BHPRrbCs2qM8-zBaiL5pO3+9k5cbjtk3YVhy9_k1d7t+w@mail.gmail.com>

Hi Elijah,

On Wed, 30 Oct 2019, Elijah Newren wrote:

Show 17 quoted lines

> On Mon, Oct 28, 2019 at 6:20 PM Junio C Hamano <gitster@pobox.com> wrote:
> >
> > Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> >
> > >> Still, I rely pretty heavily on t6036, t6042, t6043, and t6046 for
> > >> sanity in the face of refactoring and rewriting -- and as mentioned
> > >> before they have caught refactoring bugs in those areas that appear at
> > >> first blush as "overzealous", ...
> > >
> > > One idea would be to try to guard those extra careful tests behind the
> > > `EXPENSIVE` prereq.
> >
> > Yeah, I like that---I think it is perfectly in line with the spirit
> > of EXPENSIVE, too.
>
> Or perhaps EXPENSIVE_ON_WINDOWS, since it's actually pretty cheap on
> linux and not that bad on Mac

Why the complexity? If you separate out the expensive tests (even if they are only expensive in terms of run time on Windows), it will make the regression tests so much more readable to the occasional reader (making them less expensive in terms of reading time...).

Show 5 quoted lines

> However, if we're going down that route, perhaps t9001-send-email.sh
> could be wrapped in an EXPENSIVE prerequisite?  That single test file
> takes an inordinate percentage of overall runtime.  One one box with a
> few extra cpus, that test both starts first and finishes last...and
> it's not far from that on even normal boxes.

I would be okay with that.

No, let me try that again. I would be _totally_ okay with that.

Ciao, Dscho