From 777ca0108c28659f4f4b3d49df57a6c1a7e3c484 Mon Sep 17 00:00:00 2001 From: Itamar Oren Date: Wed, 2 Apr 2025 17:53:41 -0700 Subject: [PATCH 1/2] Make perf version check in test_perf_profiler more robust Should work also if the version string includes a commit hash, like `perf version 6.12.9.g242e6068fd5c` --- Lib/test/test_perf_profiler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_perf_profiler.py b/Lib/test/test_perf_profiler.py index 43e5a7e114b317..7f49960096ac44 100644 --- a/Lib/test/test_perf_profiler.py +++ b/Lib/test/test_perf_profiler.py @@ -501,7 +501,7 @@ def _is_perf_version_at_least(major, minor): version = output.split()[2] version = version.split("-")[0] version = version.split(".") - version = tuple(map(int, version)) + version = tuple(map(int, version[:2])) return version >= (major, minor) From c064e8391c030b9300ba6cf830ca4791f7b5ede1 Mon Sep 17 00:00:00 2001 From: Itamar Oren Date: Thu, 3 Apr 2025 09:54:17 -0700 Subject: [PATCH 2/2] Add note to comment --- Lib/test/test_perf_profiler.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_perf_profiler.py b/Lib/test/test_perf_profiler.py index 7f49960096ac44..1922d8e0bab216 100644 --- a/Lib/test/test_perf_profiler.py +++ b/Lib/test/test_perf_profiler.py @@ -493,7 +493,8 @@ def compile_trampolines_for_all_functions(): def _is_perf_version_at_least(major, minor): # The output of perf --version looks like "perf version 6.7-3" but - # it can also be perf version "perf version 5.15.143" + # it can also be perf version "perf version 5.15.143", or even include + # a commit hash in the version string, like "6.12.9.g242e6068fd5c" try: output = subprocess.check_output(["perf", "--version"], text=True) except (subprocess.CalledProcessError, FileNotFoundError):