Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bpo-42207: Disable peg generator tests when building with PGO #23141

Merged
merged 1 commit into from
Nov 4, 2020
Merged

bpo-42207: Disable peg generator tests when building with PGO #23141

merged 1 commit into from
Nov 4, 2020

Conversation

serge-sans-paille
Copy link
Contributor

@serge-sans-paille serge-sans-paille commented Nov 4, 2020 •
edited
Loading

Otherwise, when running the testsuite, test_peg_generator tries to compile C
code using the optimized flags and fails because it cannot find the profile
data.

https://bugs.python.org/issue42207

@bedevere-bot bedevere-bot added tests Tests in the Lib/test dir awaiting review labels Nov 4, 2020
pablogsal
pablogsal reviewed Nov 4, 2020
View reviewed changes
Lib/test/test_peg_generator/test_c_parser.py Outdated
@@ -8,6 +9,10 @@
from test.support import os_helper
from test.support.script_helper import assert_python_ok

_pyflags_nodist = sysconfig.get_config_var('PY_CFLAGS_NODIST') or ""
if sysconfig.get_config_var('PGO_PROF_USE_FLAG') in _pyflags_nodist:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if sysconfig.get_config_var('PGO_PROF_USE_FLAG') in _pyflags_nodist:
if sysconfig.get_config_var('PGO_PROF_USE_FLAG') is not None and sysconfig.get_config_var('PGO_PROF_USE_FLAG') in _pyflags_nodist:

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sysconfig.get_config_var('PGO_PROF_USE_FLAG') can be None (chec the windows output).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made a small variation on that idea.

@serge-sans-paille
Disable peg generator tests when building with PGO
5eb1506 
Otherwise, when running the testsuite, test_peg_generator tries to compile C
code using the optimized flags and fails because it cannot find the profile
data.

https://bugs.python.org/issue42207
@pablogsal pablogsal merged commit 100964e into python:master Nov 4, 2020
@pablogsal pablogsal added the needs backport to 3.9 only security fixes label Nov 4, 2020
@miss-islington
Copy link
Contributor

Thanks @serge-sans-paille for the PR, and @pablogsal for merging it 🌮🎉.. I'm working now to backport this PR to: 3.9.
🐍🍒⛏🤖

@pablogsal
Copy link
Member

Thanks for the PR @serge-sans-paille !

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Nov 4, 2020
@serge-sans-paille @miss-islington
Disable peg generator tests when building with PGO (pythonGH-23141)
099bc40 
Otherwise, when running the testsuite, test_peg_generator tries to compile C
code using the optimized flags and fails because it cannot find the profile
data.
(cherry picked from commit 100964e)

Co-authored-by: serge-sans-paille <[email protected]>
@bedevere-bot
Copy link

GH-23155 is a backport of this pull request to the 3.9 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.9 only security fixes label Nov 4, 2020
miss-islington added a commit that referenced this pull request Nov 4, 2020
@miss-islington @serge-sans-paille
Disable peg generator tests when building with PGO (GH-23141)
3997a4e 
Otherwise, when running the testsuite, test_peg_generator tries to compile C
code using the optimized flags and fails because it cannot find the profile
data.
(cherry picked from commit 100964e)

Co-authored-by: serge-sans-paille <[email protected]>
shihai1991 added a commit to shihai1991/cpython that referenced this pull request Nov 5, 2020
@shihai1991
Merge branch 'master' into bpo_41832
c267e35 
* master:
  bpo-42260: Add _PyInterpreterState_SetConfig() (pythonGH-23158)
  Disable peg generator tests when building with PGO (pythonGH-23141)
  bpo-1635741: _sqlite3 uses PyModule_AddObjectRef() (pythonGH-23148)
  bpo-1635741: Fix PyInit_pyexpat() error handling (pythonGH-22489)
  bpo-42260: Main init modify sys.flags in-place (pythonGH-23150)
  bpo-1635741: Fix ref leak in _PyWarnings_Init() error path (pythonGH-23151)
  bpo-1635741: _ast uses PyModule_AddObjectRef() (pythonGH-23146)
  bpo-1635741: _contextvars uses PyModule_AddType() (pythonGH-23147)
  bpo-42260: Reorganize PyConfig (pythonGH-23149)
  bpo-1635741: Add PyModule_AddObjectRef() function (pythonGH-23122)
  bpo-42236: os.device_encoding() respects UTF-8 Mode (pythonGH-23119)
  bpo-42251: Add gettrace and getprofile to threading (pythonGH-23125)
  Enable signing of nuget.org packages and update to supported timestamp server (pythonGH-23132)
  Fix incorrect links in ast docs (pythonGH-23017)
  Add _PyType_GetModuleByDef (pythonGH-22835)
  Post 3.10.0a2
  bpo-41796: Call _PyAST_Fini() earlier to fix a leak (pythonGH-23131)
  bpo-42249: Fix writing binary Plist files larger than 4 GiB. (pythonGH-23121)
  bpo-40077: Convert mmap.mmap static type to a heap type (pythonGH-23108)
  Python 3.10.0a2
shihai1991 added a commit to shihai1991/cpython that referenced this pull request Nov 7, 2020
@shihai1991
Merge remote-tracking branch 'origin/master' into bpo_41073_add_types…
2d72953 
…lots1

* origin/master: (80 commits)
  bpo-42282: Fold constants inside named expressions (pythonGH-23190)
  bpo-41028: Doc: Move switchers to docsbuild-scripts. (pythonGH-20969)
  bpo-42133: update parts of the stdlib to fall back to `__spec__.loader` when `__loader__` is missing (python#22929)
  Remove outdated reference to pywin32 from platform module (pythonGH-22005)
  bpo-41832: PyType_FromModuleAndSpec() now accepts NULL tp_doc (pythonGH-23123)
  Minor grammar edits for the descriptor howto guide (GH-python#23175)
  bpo-42179: Doc/tutorial: Remove mention of __cause__ (pythonGH-23162)
  bpo-26389: Allow passing an exception object in the traceback module (pythonGH-22610)
  bpo-42260: PyConfig_Read() only parses argv once (pythonGH-23168)
  bpo-42260: Add _PyConfig_FromDict() (pythonGH-23167)
  bpo-41877 Check for asert, aseert, assrt in mocks (pythonGH-23165)
  [docs] fix wrongly named AsyncContextDecorator (pythonGH-23164)
  bpo-42262: Add Py_NewRef() and Py_XNewRef() (pythonGH-23152)
  bpo-42266: Handle monkey-patching descriptors in LOAD_ATTR cache (pythonGH-23157)
  bpo-40816 Add AsyncContextDecorator class (pythonGH-20516)
  bpo-42260: Add _PyInterpreterState_SetConfig() (pythonGH-23158)
  Disable peg generator tests when building with PGO (pythonGH-23141)
  bpo-1635741: _sqlite3 uses PyModule_AddObjectRef() (pythonGH-23148)
  bpo-1635741: Fix PyInit_pyexpat() error handling (pythonGH-22489)
  bpo-42260: Main init modify sys.flags in-place (pythonGH-23150)
  ...
adorilson pushed a commit to adorilson/cpython that referenced this pull request Mar 13, 2021
@serge-sans-paille @adorilson
Disable peg generator tests when building with PGO (pythonGH-23141)
979b9de 
Otherwise, when running the testsuite, test_peg_generator tries to compile C
code using the optimized flags and fails because it cannot find the profile
data.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pablogsal pablogsal pablogsal approved these changes

@lysnikolaou lysnikolaou Awaiting requested review from lysnikolaou

Assignees
No one assigned
Labels
skip news tests Tests in the Lib/test dir
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@serge-sans-paille @miss-islington @pablogsal @bedevere-bot @the-knights-who-say-ni