From: "Philippe Blain via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Victoria Dye <vdye@github.com>,
Neeraj Singh <neerajsi@microsoft.com>,
Patrick Steinhardt <ps@pks.im>,
Philippe Blain <levraiphilippeblain@gmail.com>,
Philippe Blain <levraiphilippeblain@gmail.com>
Subject: [PATCH v2 1/3] p7821: fix test_perf invocation for prereqs
Date: Sat, 12 Apr 2025 18:15:30 +0000 [thread overview]
Message-ID: <41a093d570a5756f730b069980edafbcedf5c8bc.1744481732.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1936.v2.git.git.1744481732.gitgitgadget@gmail.com>
From: Philippe Blain <levraiphilippeblain@gmail.com>
Since 5dccd9155f (t/perf: add iteration setup mechanism to perf-lib,
2022-04-04), perf tests need to declare their prerequisites with
'--prereq', after the test title. p7821 was forgotten in that commit,
such that running that test on a machine where the PCRE prereq is not
satisfied aborts the test with:
error: bug in the test script: test_wrapper_ needs 2 positional parameters
Fix this by correcting the two 'test_perf' invocations in that test
suite.
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
---
t/perf/p7821-grep-engines-fixed.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/perf/p7821-grep-engines-fixed.sh b/t/perf/p7821-grep-engines-fixed.sh
index 61e41b82cff..1d126c7b039 100755
--- a/t/perf/p7821-grep-engines-fixed.sh
+++ b/t/perf/p7821-grep-engines-fixed.sh
@@ -33,13 +33,13 @@ do
fi
if ! test_have_prereq PERF_GREP_ENGINES_THREADS
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' || :
"
else
for threads in $GIT_PERF_GREP_THREADS
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' || :
"
done
--
gitgitgadget
next prev parent reply other threads:[~2025-04-12 18:15 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-28 17:07 [PATCH 0/2] Two perf test fixes Philippe Blain via GitGitGadget
2025-03-28 17:07 ` [PATCH 1/2] p7821: fix test_perf invocation for prereqs Philippe Blain via GitGitGadget
2025-03-31 7:27 ` Patrick Steinhardt
2025-04-13 19:00 ` Philippe Blain
2025-03-28 17:07 ` [PATCH 2/2] p9210: fix 'scalar clone' when running from a detached HEAD Philippe Blain via GitGitGadget
2025-03-31 7:27 ` Patrick Steinhardt
2025-04-12 18:15 ` [PATCH v2 0/3] Two perf test fixes Philippe Blain via GitGitGadget
2025-04-12 18:15 ` Philippe Blain via GitGitGadget [this message]
2025-04-12 18:15 ` [PATCH v2 2/3] p9210: fix 'scalar clone' when running from a detached HEAD Philippe Blain via GitGitGadget
2025-04-12 18:15 ` [PATCH v2 3/3] p7821: fix instructions for testing with threads Philippe Blain via GitGitGadget
2025-04-14 21:48 ` Junio C Hamano
2025-04-13 2:50 ` [PATCH v2 0/3] Two perf test fixes Philippe Blain
2025-04-14 16:04 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=41a093d570a5756f730b069980edafbcedf5c8bc.1744481732.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=levraiphilippeblain@gmail.com \
--cc=neerajsi@microsoft.com \
--cc=ps@pks.im \
--cc=vdye@github.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.
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 NNTP newsgroup(s).