Re: [PATCH 0/6] Add merge recursive testcases with undetected conflicts

From: Jeff King <peff@peff.net>
Date: Jul 10, 2018, 17:19 UTC
Message-ID: <20180710171957.GJ23624@sigill.intra.peff.net>
In-Reply-To: <CABPp-BG5Rn=3MBS+daSJ+2rLsZWcswP3=8zX-F=5ncdzc9y=SQ@mail.gmail.com>

On Tue, Jul 10, 2018 at 08:42:04AM -0700, Elijah Newren wrote:

Show 12 quoted lines

> > test-lint is supposed to be run automatically as part of "make test" (or
> > "make prove"), unless you've specifically disabled it by setting
> > TEST_LINT. And it does complain for me with your patches. If it doesn't
> > for you, then we have a bug to fix. :)
> 
> Oh, this may be my bad.  Years ago someone pointed out that the
> testsuite could be run under 'prove', which provided nicer output and
> made sure to run the longest tests (e.g. the horrifically slow
> t9001-send-email.sh) first.  So my test alias is:
> 
>    time prove -j7 --timer --state failed,slow,save t[0-9]*.sh ::
> "--root=/dev/shm"

Heh, OK, that makes sense.

> (with possibly different -j settings on different machines) and I just
> stopped running make test.  Didn't learn about the 'make prove'
> target, even though it's apparently now been there for nearly 8 years.

I have:

  GIT_TEST_OPTS = --root=/var/ram/git-tests
  GIT_PROVE_OPTS = -j16 --state=slow,save
  DEFAULT_TEST_TARGET = prove

in my config.mak. That lets me just do:

  make test

from the top-level to get a build-and-test. It also allows just "make" from the "t" directory to do the right thing. Slightly annoyingly, "make test" in the "t" directory does the wrong thing, which bites me about once a month. ;)

-Peff