[PATCH] t/perf: add fallback for pre-bin-wrappers versions of git
- From
Jeff King <peff@peff.net>
- Date
- Mar 3, 2017, 07:36 UTC
- Message-ID
- <20170303073633.maoaovchkz32h467@sigill.intra.peff.net>
- In-Reply-To
- <20170303071403.2k3vbcdstllq2j3y@sigill.intra.peff.net>
On Fri, Mar 03, 2017 at 02:14:03AM -0500, Jeff King wrote:
Show 6 quoted lines
> With this patch I was able to run p0001 against v1.7.0. I don't think we > can go further back than that because the perf library depends on the > presence of bin-wrappers. That's probably enough. Unlike the t/interop > library I proposed recently it's not that interesting to go really far > back in time (and I did hack around the bin-wrappers thing in t/interop; > you really can test against v1.0.0 there).
This is easy to fix (see below). I doubt anybody cares, but it's probably worth fixing just because the failure mode (quietly running whatever git is in your PATH) is so confusing. It would also be an improvement to just detect the situation and die(), but this is literally not any more effort.
-- >8 -- Subject: [PATCH] t/perf: add fallback for pre-bin-wrappers versions of git
It's tempting to say:
./run v1.0.0 HEAD
to see how we've sped up Git over the years. Unfortunately, this doesn't quite work because versions of Git prior to v1.7.0 lack bin-wrappers, so our "run" script doesn't correctly put them in the PATH.
Worse, it means we silently find whatever other "git" is in the PATH, and produce test results that have no bearing on what we asked for.
Let's fallback to the main git directory when bin-wrappers isn't present. Many modern perf scripts won't run with such an antique version of Git, of course, but at least those failures are detected and reported (and you're free to write a limited perf script that works across many versions).
Signed-off-by: Jeff King <peff@peff.net> --- t/perf/run | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/t/perf/run b/t/perf/run index e8adedadf..c788d713a 100755 --- a/t/perf/run +++ b/t/perf/run @@ -63,6 +63,9 @@ run_dirs_helper () { unset GIT_TEST_INSTALLED else GIT_TEST_INSTALLED="$mydir/bin-wrappers" + # Older versions of git lacked bin-wrappers; fallback to the + # files in the root. + test -d "$GIT_TEST_INSTALLED" || GIT_TEST_INSTALLED=$mydir export GIT_TEST_INSTALLED fi run_one_dir "$@"
-- 2.12.0.385.gdf4947bc7