From: Jeff King <peff@peff.net>
To: Elijah Newren <newren@gmail.com>
Cc: Stefan Beller <sbeller@google.com>,
Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 0/6] Add merge recursive testcases with undetected conflicts
Date: Tue, 10 Jul 2018 13:19:57 -0400 [thread overview]
Message-ID: <20180710171957.GJ23624@sigill.intra.peff.net> (raw)
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:
> > 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
next prev parent reply other threads:[~2018-07-10 18:20 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-01 4:11 [PATCH 0/6] Add merge recursive testcases with undetected conflicts Elijah Newren
2018-07-01 4:11 ` [PATCH 1/6] t6036: add a failed conflict detection case with symlink modify/modify Elijah Newren
2018-07-01 4:11 ` [PATCH 2/6] t6036: add a failed conflict detection case with symlink add/add Elijah Newren
2018-07-01 4:11 ` [PATCH 3/6] t6036: add a failed conflict detection case with submodule modify/modify Elijah Newren
2018-07-01 4:11 ` [PATCH 4/6] t6036: add a failed conflict detection case with submodule add/add Elijah Newren
2018-07-01 4:11 ` [PATCH 5/6] t6036: add a failed conflict detection case with conflicting types Elijah Newren
2018-07-01 4:11 ` [PATCH 6/6] t6036: add a failed conflict detection case: regular files, different modes Elijah Newren
2018-07-09 17:53 ` [PATCH 0/6] Add merge recursive testcases with undetected conflicts Junio C Hamano
2018-07-09 20:22 ` Elijah Newren
2018-07-10 4:44 ` Jeff King
2018-07-10 15:42 ` Elijah Newren
2018-07-10 17:19 ` Jeff King [this message]
2018-07-11 4:02 ` Elijah Newren
2018-07-11 15:40 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180710171957.GJ23624@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).