admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pb/perf-test-fixes'

Browse Source 
"make perf" fixes.

* pb/perf-test-fixes:
  p7821: fix instructions for testing with threads
  p9210: fix 'scalar clone' when running from a detached HEAD
  p7821: fix test_perf invocation for prereqs
This commit is contained in:
Junio C Hamano
2025-04-23 13:58:50 -07:00
parent 4bbb303af6 1665f12fa0
commit 68cd0cfa7e
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
t/perf/p7821-grep-engines-fixed.sh
View File

@@ -7,7 +7,7 @@ git-grep. Make sure to include a leading space,
e.g. GIT_PERF_7821_GREP_OPTS=' -w'. See p7820-grep-engines.sh for more e.g. GIT_PERF_7821_GREP_OPTS=' -w'. See p7820-grep-engines.sh for more
options to try. options to try.
If GIT_PERF_7821_THREADS is set to a list of threads (e.g. '1 4 8' If GIT_PERF_GREP_THREADS is set to a list of threads (e.g. '1 4 8'
etc.) we will test the patterns under those numbers of threads. etc.) we will test the patterns under those numbers of threads.
" "
@@ -33,13 +33,13 @@ do
fi fi
if ! test_have_prereq PERF_GREP_ENGINES_THREADS if ! test_have_prereq PERF_GREP_ENGINES_THREADS
then then
test_perf $prereq "$engine grep$GIT_PERF_7821_GREP_OPTS $pattern" " test_perf "$engine grep$GIT_PERF_7821_GREP_OPTS $pattern" --prereq "$prereq" "
git -c grep.patternType=$engine grep$GIT_PERF_7821_GREP_OPTS $pattern >'out.$engine' || : git -c grep.patternType=$engine grep$GIT_PERF_7821_GREP_OPTS $pattern >'out.$engine' || :
" "
else else
for threads in $GIT_PERF_GREP_THREADS for threads in $GIT_PERF_GREP_THREADS
do do
test_perf PTHREADS,$prereq "$engine grep$GIT_PERF_7821_GREP_OPTS $pattern with $threads threads" " test_perf "$engine grep$GIT_PERF_7821_GREP_OPTS $pattern with $threads threads" --prereq "PTHREADS,$prereq" "
git -c grep.patternType=$engine -c grep.threads=$threads grep$GIT_PERF_7821_GREP_OPTS $pattern >'out.$engine.$threads' || : git -c grep.patternType=$engine -c grep.threads=$threads grep$GIT_PERF_7821_GREP_OPTS $pattern >'out.$engine.$threads' || :
" "
done done

3
t/perf/p9210-scalar.sh
View File

@@ -7,7 +7,8 @@ test_perf_large_repo "$TRASH_DIRECTORY/to-clone"
test_expect_success 'enable server-side partial clone' ' test_expect_success 'enable server-side partial clone' '
git -C to-clone config uploadpack.allowFilter true && git -C to-clone config uploadpack.allowFilter true &&
git -C to-clone config uploadpack.allowAnySHA1InWant true git -C to-clone config uploadpack.allowAnySHA1InWant true &&
git -C to-clone checkout -B test-branch
' '
test_perf 'scalar clone' ' test_perf 'scalar clone' '