summaryrefslogtreecommitdiff
path: root/t/perf/perf-lib.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-11 17:31:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-07-11 17:31:06 (GMT)
commite9a6d713316d2e774d8005b8594a4fad75d7652d (patch)
treeb785c5e2a1c08f7ed88560a80f4450d426539b23 /t/perf/perf-lib.sh
parent3c5de5c77b0718b47010b146160ecff6309f86b5 (diff)
parent85a727895d6868e98c3f72e25e371dcb867d6b69 (diff)
downloadgit-e9a6d713316d2e774d8005b8594a4fad75d7652d.zip
git-e9a6d713316d2e774d8005b8594a4fad75d7652d.tar.gz
git-e9a6d713316d2e774d8005b8594a4fad75d7652d.tar.bz2
Merge branch 'jk/perf-any-version'
Allow t/perf framework to use the features from the most recent version of Git even when testing an older installed version. * jk/perf-any-version: p4211: explicitly disable renames in no-rename test t/perf: fix regression in testing older versions of git
Diffstat (limited to 't/perf/perf-lib.sh')
-rw-r--r--t/perf/perf-lib.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
index 773f955..46f08ee 100644
--- a/t/perf/perf-lib.sh
+++ b/t/perf/perf-lib.sh
@@ -52,6 +52,9 @@ TEST_NO_MALLOC_CHECK=t
# need to export them for test_perf subshells
export TEST_DIRECTORY TRASH_DIRECTORY GIT_BUILD_DIR GIT_TEST_CMP
+MODERN_GIT=$GIT_BUILD_DIR/bin-wrappers/git
+export MODERN_GIT
+
perf_results_dir=$TEST_OUTPUT_DIRECTORY/test-results
mkdir -p "$perf_results_dir"
rm -f "$perf_results_dir"/$(basename "$0" .sh).subtests
@@ -81,7 +84,7 @@ test_perf_create_repo_from () {
repo="$1"
source="$2"
source_git="$(git -C "$source" rev-parse --git-dir)"
- objects_dir="$(git -C "$source" rev-parse --git-path objects)"
+ objects_dir="$("$MODERN_GIT" -C "$source" rev-parse --git-path objects)"
mkdir -p "$repo/.git"
(
cd "$source" &&