From: Elijah Newren Date: Wed, 30 Oct 2019 07:01:06 GMT Subject: Re: [PATCH 2/2] merge-recursive: fix merging a subdirectory into the root directory Message-ID: In-Reply-To: On Mon, Oct 28, 2019 at 6:20 PM Junio C Hamano wrote: > > Johannes Schindelin 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 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.