From: Victor Stinner <vstinner@python.org>
Date: Mon, 15 Apr 2024 13:59:34 +0000 (+0200)
Subject: gh-117889: Fix PGO test in test_peg_generator (#117893)
X-Git-Tag: v3.13.0b1~425
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=64cd6fc9a6a3c3c19091a1c81cbbe8994583017d;p=thirdparty%2FPython%2Fcpython.git

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.
---

diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py
index 0cfd033bb637..1db9fb9537f8 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 9e273e99e387..1411e55dd0f2 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")