summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@python.org>2024-04-15 13:59:34 (GMT)
committerGitHub <noreply@github.com>2024-04-15 13:59:34 (GMT)
commit64cd6fc9a6a3c3c19091a1c81cbbe8994583017d (patch)
tree1b628e90318c56d2746998cfc2c50ea14a04aec2
parent784e076a10e828f383282df8a4b993a1b821f547 (diff)
downloadcpython-64cd6fc9a6a3c3c19091a1c81cbbe8994583017d.zip
cpython-64cd6fc9a6a3c3c19091a1c81cbbe8994583017d.tar.gz
cpython-64cd6fc9a6a3c3c19091a1c81cbbe8994583017d.tar.bz2
gh-117889: Fix PGO test in test_peg_generator (#117893)
Reuse support.check_cflags_pgo() in test_peg_generator to check for PGO build. Log PGO_PROF_USE_FLAG in test.pythoninfo.
-rw-r--r--Lib/test/pythoninfo.py1
-rw-r--r--Lib/test/test_peg_generator/test_c_parser.py4
2 files changed, 2 insertions, 3 deletions
diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py
index 0cfd033..1db9fb9 100644
--- a/Lib/test/pythoninfo.py
+++ b/Lib/test/pythoninfo.py
@@ -513,6 +513,7 @@ def collect_sysconfig(info_add):
'MACHDEP',
'MULTIARCH',
'OPT',
+ 'PGO_PROF_USE_FLAG',
'PY_CFLAGS',
'PY_CFLAGS_NODIST',
'PY_CORE_LDFLAGS',
diff --git a/Lib/test/test_peg_generator/test_c_parser.py b/Lib/test/test_peg_generator/test_c_parser.py
index 9e273e9..1411e55 100644
--- a/Lib/test/test_peg_generator/test_c_parser.py
+++ b/Lib/test/test_peg_generator/test_c_parser.py
@@ -13,9 +13,7 @@ from test import support
from test.support import os_helper, import_helper
from test.support.script_helper import assert_python_ok
-_py_cflags_nodist = sysconfig.get_config_var("PY_CFLAGS_NODIST")
-_pgo_flag = sysconfig.get_config_var("PGO_PROF_USE_FLAG")
-if _pgo_flag and _py_cflags_nodist and _pgo_flag in _py_cflags_nodist:
+if support.check_cflags_pgo():
raise unittest.SkipTest("peg_generator test disabled under PGO build")
test_tools.skip_if_missing("peg_generator")