git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Patrick Steinhardt <ps@pks.im>
To: git@vger.kernel.org
Subject: [PATCH 2/5] t/perf: use configured PERL_PATH
Date: Mon, 31 Mar 2025 08:16:45 +0200	[thread overview]
Message-ID: <20250331-pks-meson-benchmarks-v1-2-b2ace85616a3@pks.im> (raw)
In-Reply-To: <20250331-pks-meson-benchmarks-v1-0-b2ace85616a3@pks.im>

Our benchmarks use a couple of Perl scripts to compute results. These
Perl scripts get executed directly, and as the shebang is hardcoded to
"/usr/bin/perl" this will fail on any system where the Perl interpreter
is located in a different path.

Our build infrastructure already lets users configure the location of
Perl, which ultimately gets written into the GIT-BUILD-OPTIONS file.
This file is being sourced by "test-lib.sh", and consequently we already
have the "PERL_PATH" variable available that contains its configured
location.

Use "PERL_PATH" to execute Perl scripts, which makes them work on more
esoteric systems like NixOS.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
---
 t/perf/perf-lib.sh | 4 ++--
 t/perf/run         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
index 1a9a51ca3cc..4173eee4def 100644
--- a/t/perf/perf-lib.sh
+++ b/t/perf/perf-lib.sh
@@ -276,7 +276,7 @@ test_perf_ () {
 	else
 		test_ok_ "$1"
 	fi
-	"$TEST_DIRECTORY"/perf/min_time.perl test_time.* >"$base".result
+	"$PERL_PATH" "$TEST_DIRECTORY"/perf/min_time.perl test_time.* >"$base".result
 	rm test_time.*
 }
 
@@ -324,7 +324,7 @@ test_at_end_hook_ () {
 	if test -z "$GIT_PERF_AGGREGATING_LATER"; then
 		(
 			cd "$TEST_DIRECTORY"/perf &&
-			./aggregate.perl --results-dir="$TEST_RESULTS_DIR" $(basename "$0")
+			"$PERL_PATH" ./aggregate.perl --results-dir="$TEST_RESULTS_DIR" $(basename "$0")
 		)
 	fi
 }
diff --git a/t/perf/run b/t/perf/run
index 486ead21980..073bcb2afff 100755
--- a/t/perf/run
+++ b/t/perf/run
@@ -192,10 +192,10 @@ run_subsection () {
 
 	if test -z "$GIT_PERF_SEND_TO_CODESPEED"
 	then
-		./aggregate.perl --results-dir="$TEST_RESULTS_DIR" $codespeed_opt "$@"
+		"$PERL_PATH" ./aggregate.perl --results-dir="$TEST_RESULTS_DIR" $codespeed_opt "$@"
 	else
 		json_res_file=""$TEST_RESULTS_DIR"/$GIT_PERF_SUBSECTION/aggregate.json"
-		./aggregate.perl --results-dir="$TEST_RESULTS_DIR" --codespeed "$@" | tee "$json_res_file"
+		"$PERL_PATH" ./aggregate.perl --results-dir="$TEST_RESULTS_DIR" --codespeed "$@" | tee "$json_res_file"
 		send_data_url="$GIT_PERF_SEND_TO_CODESPEED/result/add/json/"
 		curl -v --request POST --data-urlencode "json=$(cat "$json_res_file")" "$send_data_url"
 	fi

-- 
2.49.0.604.gff1f9ca942.dirty


  parent reply	other threads:[~2025-03-31  6:17 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-31  6:16 [PATCH 0/5] meson: wire up support for benchmarks Patrick Steinhardt
2025-03-31  6:16 ` [PATCH 1/5] t/perf: fix benchmarks with alternate repo formats Patrick Steinhardt
2025-03-31  6:16 ` Patrick Steinhardt [this message]
2025-04-10 11:43   ` [PATCH 2/5] t/perf: use configured PERL_PATH Toon Claes
2025-04-14  6:50     ` Patrick Steinhardt
2025-04-14 19:20       ` Junio C Hamano
2025-04-15 10:01         ` Patrick Steinhardt
2025-03-31  6:16 ` [PATCH 3/5] t/perf: fix benchmarks with out-of-tree builds Patrick Steinhardt
2025-04-10 11:34   ` Toon Claes
2025-04-14  6:28     ` Toon Claes
2025-04-14  6:50       ` Patrick Steinhardt
2025-03-31  6:16 ` [PATCH 4/5] meson: wire up benchmarks Patrick Steinhardt
2025-04-10 11:44   ` Toon Claes
2025-04-14  6:50     ` Patrick Steinhardt
2025-04-14  9:07       ` Toon Claes
2025-03-31  6:16 ` [PATCH 5/5] meson: wire up benchmarking options Patrick Steinhardt
2025-04-14  6:51 ` [PATCH v2 0/5] meson: wire up support for benchmarks Patrick Steinhardt
2025-04-14  6:51   ` [PATCH v2 1/5] t/perf: fix benchmarks with alternate repo formats Patrick Steinhardt
2025-04-14  6:51   ` [PATCH v2 2/5] t/perf: use configured PERL_PATH Patrick Steinhardt
2025-04-14  6:51   ` [PATCH v2 3/5] t/perf: fix benchmarks with out-of-tree builds Patrick Steinhardt
2025-04-20 10:00     ` Christian Couder
2025-04-22  6:51       ` Patrick Steinhardt
2025-04-14  6:51   ` [PATCH v2 4/5] meson: wire up benchmarks Patrick Steinhardt
2025-04-20 10:00     ` Christian Couder
2025-04-14  6:51   ` [PATCH v2 5/5] meson: wire up benchmarking options Patrick Steinhardt
2025-04-15 14:36   ` [PATCH v2 0/5] meson: wire up support for benchmarks Junio C Hamano
2025-04-15 18:18     ` Junio C Hamano
2025-04-16 11:00       ` Patrick Steinhardt
2025-04-18 23:02         ` Junio C Hamano
2025-04-22  6:50 ` [PATCH v3 " Patrick Steinhardt
2025-04-22  6:50   ` [PATCH v3 1/5] t/perf: fix benchmarks with alternate repo formats Patrick Steinhardt
2025-04-22  6:50   ` [PATCH v3 2/5] t/perf: use configured PERL_PATH Patrick Steinhardt
2025-04-22  6:50   ` [PATCH v3 3/5] t/perf: fix benchmarks with out-of-tree builds Patrick Steinhardt
2025-04-22  6:50   ` [PATCH v3 4/5] meson: wire up benchmarks Patrick Steinhardt
2025-04-22  6:50   ` [PATCH v3 5/5] meson: wire up benchmarking options Patrick Steinhardt
2025-04-22  7:27   ` [PATCH v3 0/5] meson: wire up support for benchmarks Christian Couder
2025-04-22  7:53     ` Patrick Steinhardt
2025-04-23 14:44       ` Christian Couder
2025-04-24  4:31         ` Patrick Steinhardt
2025-04-24  6:28           ` Christian Couder
2025-04-24 11:13           ` Junio C Hamano
2025-04-24 13:49             ` Patrick Steinhardt
2025-04-23 14:12   ` Toon Claes
2025-04-25  7:28 ` [PATCH v4 " Patrick Steinhardt
2025-04-25  7:28   ` [PATCH v4 1/5] t/perf: fix benchmarks with alternate repo formats Patrick Steinhardt
2025-04-25  7:28   ` [PATCH v4 2/5] t/perf: use configured PERL_PATH Patrick Steinhardt
2025-04-25  7:28   ` [PATCH v4 3/5] t/perf: fix benchmarks with out-of-tree builds Patrick Steinhardt
2025-04-25  7:28   ` [PATCH v4 4/5] meson: wire up benchmarks Patrick Steinhardt
2025-04-25  7:57     ` Christian Couder
2025-04-25  8:01       ` Patrick Steinhardt
2025-04-25  8:09         ` Christian Couder
2025-04-25  8:27           ` Patrick Steinhardt
2025-04-25  7:28   ` [PATCH v4 5/5] meson: wire up benchmarking options Patrick Steinhardt
2025-04-25  8:06   ` [PATCH v4 0/5] meson: wire up support for benchmarks Christian Couder
2025-04-25  8:26     ` Patrick Steinhardt
2025-04-25  8:33       ` Christian Couder
2025-04-28  7:30 ` [PATCH v5 " Patrick Steinhardt
2025-04-28  7:30   ` [PATCH v5 1/5] t/perf: fix benchmarks with alternate repo formats Patrick Steinhardt
2025-04-28  7:30   ` [PATCH v5 2/5] t/perf: use configured PERL_PATH Patrick Steinhardt
2025-04-28  7:30   ` [PATCH v5 3/5] t/perf: fix benchmarks with out-of-tree builds Patrick Steinhardt
2025-04-28  7:30   ` [PATCH v5 4/5] meson: wire up benchmarks Patrick Steinhardt
2025-04-28  7:30   ` [PATCH v5 5/5] meson: wire up benchmarking options Patrick Steinhardt

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=20250331-pks-meson-benchmarks-v1-2-b2ace85616a3@pks.im \
    --to=ps@pks.im \
    --cc=git@vger.kernel.org \
    /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).