]> git.ipfire.org Git - thirdparty/git.git/commitdiff
p7821: fix test_perf invocation for prereqs
authorPhilippe Blain <levraiphilippeblain@gmail.com>
Fri, 28 Mar 2025 17:07:48 +0000 (17:07 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sat, 29 Mar 2025 03:30:56 +0000 (20:30 -0700)
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/perf/p7821-grep-engines-fixed.sh

index 61e41b82cffa3721fbbc724fc699055c9457453a..1d126c7b039fec0080c1ffc08b63a0d56ed2f07a 100755 (executable)
@@ -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