diff --git a/Lib/test/libregrtest/utils.py b/Lib/test/libregrtest/utils.py
index 5e16b1ae054a26..28acb531f4d93e 100644
--- a/Lib/test/libregrtest/utils.py
+++ b/Lib/test/libregrtest/utils.py
@@ -259,16 +259,8 @@ def get_build_info():
elif '-flto' in ldflags_nodist:
optimizations.append('LTO')
- # --enable-optimizations
- pgo_options = (
- # GCC
- '-fprofile-use',
- # clang: -fprofile-instr-use=code.profclangd
- '-fprofile-instr-use',
- # ICC
- "-prof-use",
- )
- if any(option in cflags_nodist for option in pgo_options):
+ if support.check_cflags_pgo():
+ # PGO (--enable-optimizations)
optimizations.append('PGO')
if optimizations:
build.append('+'.join(optimizations))
diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py
index 8d7fb9f4f2103b..860c4cc4e0a818 100644
--- a/Lib/test/pythoninfo.py
+++ b/Lib/test/pythoninfo.py
@@ -867,6 +867,15 @@ def collect_fips(info_add):
pass
+def collect_libregrtest_utils(info_add):
+ try:
+ from test.libregrtest import utils
+ except ImportError:
+ return
+
+ info_add('libregrtests.build_info', ' '.join(utils.get_build_info()))
+
+
def collect_info(info):
error = False
info_add = info.add
@@ -904,6 +913,7 @@ def collect_info(info):
collect_tkinter,
collect_windows,
collect_zlib,
+ collect_libregrtest_utils,
# Collecting from tests should be last as they have side effects.
collect_test_socket,
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index b6350e4e5292fe..389d39c83bc006 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -781,6 +781,21 @@ def python_is_optimized():
return final_opt not in ('', '-O0', '-Og')
+def check_cflags_pgo():
+ # Check if Python was built with ./configure --enable-optimizations:
+ # with Profile Guided Optimization (PGO).
+ cflags_nodist = sysconfig.get_config_var('PY_CFLAGS_NODIST') or ''
+ pgo_options = (
+ # GCC
+ '-fprofile-use',
+ # clang: -fprofile-instr-use=code.profclangd
+ '-fprofile-instr-use',
+ # ICC
+ "-prof-use",
+ )
+ return any(option in cflags_nodist for option in pgo_options)
+
+
_header = 'nP'
_align = '0n'
if hasattr(sys, "getobjects"):
diff --git a/Lib/test/test_tools/test_freeze.py b/Lib/test/test_tools/test_freeze.py
index 922e74b441457a..671ec2961e7f8f 100644
--- a/Lib/test/test_tools/test_freeze.py
+++ b/Lib/test/test_tools/test_freeze.py
@@ -15,6 +15,10 @@
@support.requires_zlib()
@unittest.skipIf(sys.platform.startswith('win'), 'not supported on Windows')
@support.skip_if_buildbot('not all buildbots have enough space')
+# gh-103053: Skip test if Python is built with Profile Guided Optimization
+# (PGO), since the test is just too slow in this case.
+@unittest.skipIf(support.check_cflags_pgo(),
+ 'test is too slow with PGO')
class TestFreeze(unittest.TestCase):
@support.requires_resource('cpu') # Building Python is slow
diff --git a/Misc/NEWS.d/next/Tests/2023-09-20-02-32-17.gh-issue-103053.AoUJuK.rst b/Misc/NEWS.d/next/Tests/2023-09-20-02-32-17.gh-issue-103053.AoUJuK.rst
new file mode 100644
index 00000000000000..6d67bf237bdbb2
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2023-09-20-02-32-17.gh-issue-103053.AoUJuK.rst
@@ -0,0 +1,4 @@
+Skip test_freeze_simple_script() of test_tools.test_freeze if Python is built
+with ``./configure --enable-optimizations``, which means with Profile Guided
+Optimization (PGO): it just makes the test too slow. The freeze tool is tested
+by many other CIs with other (faster) compiler flags. Patch by Victor Stinner.
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy