undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jt/perf-updates' into maint

Browse Source 
The t/perf performance test suite was not prepared to test not so
old versions of Git, but now it covers versions of Git that are not
so ancient.

* jt/perf-updates:
  t/perf: add fallback for pre-bin-wrappers versions of git
  t/perf: use $MODERN_GIT for all repo-copying steps
  t/perf: export variable used in other blocks
This commit is contained in:
Junio C Hamano 2017-03-28 13:52:19 -07:00
commit e0c74e6f38
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
t/perf/p0001-rev-list.sh
View File

@ -15,7 +15,8 @@ test_perf 'rev-list --all --objects' '
' '
test_expect_success 'create new unreferenced commit' ' test_expect_success 'create new unreferenced commit' '
commit=$(git commit-tree HEAD^{tree} -p HEAD) commit=$(git commit-tree HEAD^{tree} -p HEAD) &&
test_export commit
' '
test_perf 'rev-list $commit --not --all' ' test_perf 'rev-list $commit --not --all' '

4
t/perf/perf-lib.sh
View File

@ -83,7 +83,7 @@ test_perf_create_repo_from () {
error "bug in the test script: not 2 parameters to test-create-repo" error "bug in the test script: not 2 parameters to test-create-repo"
repo="$1" repo="$1"
source="$2" source="$2"
source_git="$(git -C "$source" rev-parse --git-dir)" source_git="$("$MODERN_GIT" -C "$source" rev-parse --git-dir)"
objects_dir="$("$MODERN_GIT" -C "$source" rev-parse --git-path objects)" objects_dir="$("$MODERN_GIT" -C "$source" rev-parse --git-path objects)"
mkdir -p "$repo/.git" mkdir -p "$repo/.git"
( (
@ -102,7 +102,7 @@ test_perf_create_repo_from () {
) && ) &&
( (
cd "$repo" && cd "$repo" &&
git init -q && { "$MODERN_GIT" init -q && {
test_have_prereq SYMLINKS || test_have_prereq SYMLINKS ||
git config core.symlinks false git config core.symlinks false
} && } &&

3
t/perf/run
View File

@ -63,6 +63,9 @@ run_dirs_helper () {
unset GIT_TEST_INSTALLED unset GIT_TEST_INSTALLED
else else
GIT_TEST_INSTALLED="$mydir/bin-wrappers" 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 export GIT_TEST_INSTALLED
fi fi
run_one_dir "$@" run_one_dir "$@"