git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 1/2] p7821: fix test_perf invocation for prereqs

From
Philippe Blain via GitGitGadget <gitgitgadget@gmail.com>
Date
Mar 28, 2025, 17:07 UTC
Message-ID
<41a093d570a5756f730b069980edafbcedf5c8bc.1743181669.git.gitgitgadget@gmail.com>
In-Reply-To
<pull.1936.git.git.1743181669.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
Previous: Philippe Blain via GitGitGadgetNext: Patrick Steinhardt
Message 2 of 13 in “Two perf test fixes”
  1. 0/2 Two perf test fixesPhilippe Blain via GitGitGadget, Mar 28, 2025
  2. 1/2 p7821: fix test_perf invocation for prereqsPhilippe Blain via GitGitGadget, Mar 28, 2025
  3. Patrick SteinhardtMar 31, 2025
  4. Philippe BlainApr 13, 2025
  5. 2/2 p9210: fix 'scalar clone' when running from a detached HEADPhilippe Blain via GitGitGadget, Mar 28, 2025
  6. Patrick SteinhardtMar 31, 2025
  7. 0/3 Two perf test fixesPhilippe Blain via GitGitGadget, Apr 12, 2025
  8. 1/3 p7821: fix test_perf invocation for prereqsPhilippe Blain via GitGitGadget, Apr 12, 2025
  9. 2/3 p9210: fix 'scalar clone' when running from a detached HEADPhilippe Blain via GitGitGadget, Apr 12, 2025
  10. 3/3 p7821: fix instructions for testing with threadsPhilippe Blain via GitGitGadget, Apr 12, 2025
  11. Junio C HamanoApr 14, 2025
  12. Philippe BlainApr 13, 2025
  13. Junio C HamanoApr 14, 2025

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.