Skip to content

regrtest: Synchronize regrtest in 3.11 and 3.12 branches with main branch #110756

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
Closed
vstinner opened this issue Oct 12, 2023 · 0 comments
Closed

regrtest: Synchronize regrtest in 3.11 and 3.12 branches with main branch #110756

vstinner opened this issue Oct 12, 2023 · 0 comments
Labels
tests Tests in the Lib/test dir

Comments

@vstinner
Copy link
Member

vstinner commented Oct 12, 2023 •
edited by bedevere-app bot
Loading

Last weeks, it wasn't possible to synchronize regrtest from main to 3.12 since the 3.12 branch was blocked to prepare the final release. Now, there are tons of changes in main which were not backported to 3.12.

We can attempt to backport every single regrtest changes from main to 3.12, but it's a huge main to manage cherry-pick and all merge conflict. It did it once and it was really tricky and it's a fragile way.

I propose the trivial and reliable way: copy all files from main to 3.12 and 3.11 branches. It's reliable since we make sure that the code is consistent, no risk of missing a change or messing a resolution of a merge conflict.

Linked PRs
@vstinner vstinner added the tests Tests in the Lib/test dir label Oct 12, 2023
vstinner added a commit to vstinner/cpython that referenced this issue Oct 12, 2023
@vstinner
pythongh-110756: Sync regrtest with main branch
33ff4eb 
Copy files from main to this branch:

* Lib/test/libregrtest/*.py
* Lib/test/__init__.py
* Lib/test/__main__.py
* Lib/test/autotest.py
* Lib/test/pythoninfo.py
* Lib/test/regrtest.py
* Lib/test/test_regrtest.py

Do not modify scripts running tests such as Makefile.pre.in,
.github/workflows/build.yml or Tools/scripts/run_tests.py: do not use
--fast-ci and --slow-ci in this change.

Changes:

* SPLITTESTDIRS: don't include test_inspect.
* Add utils.process_cpu_count() using len(os.sched_getaffinity(0)).
* test_regrtest doesn't use @support.without_optimizer which doesn't
  exist in Python 3.12.
* Add support.set_sanitizer_env_var().
vstinner added a commit to vstinner/cpython that referenced this issue Oct 12, 2023
@vstinner
pythongh-110756: Sync regrtest with main branch
c27abfb 
Copy files from main to this branch:

* Lib/test/libregrtest/*.py
* Lib/test/__init__.py
* Lib/test/__main__.py
* Lib/test/autotest.py
* Lib/test/pythoninfo.py
* Lib/test/regrtest.py
* Lib/test/test_regrtest.py

Do not modify scripts running tests such as Makefile.pre.in,
.github/workflows/build.yml or Tools/scripts/run_tests.py: do not use
--fast-ci and --slow-ci in this change.

Changes:

* SPLITTESTDIRS: don't include test_inspect.
* Add utils.process_cpu_count() using len(os.sched_getaffinity(0)).
* test_regrtest doesn't use @support.without_optimizer which doesn't
  exist in Python 3.12.
* Add support.set_sanitizer_env_var().
* Update test_faulthandler to use support.set_sanitizer_env_var().
@bedevere-app bedevere-app bot mentioned this issue Oct 12, 2023
Merged
vstinner added a commit that referenced this issue Oct 12, 2023
@vstinner
[3.12] gh-110756: Sync regrtest with main branch (#110758)
4b7a12d 
gh-110756: Sync regrtest with main branch

Copy files from main to this branch:

* Lib/test/libregrtest/*.py
* Lib/test/__init__.py
* Lib/test/__main__.py
* Lib/test/autotest.py
* Lib/test/pythoninfo.py
* Lib/test/regrtest.py
* Lib/test/test_regrtest.py

Do not modify scripts running tests such as Makefile.pre.in,
.github/workflows/build.yml or Tools/scripts/run_tests.py: do not use
--fast-ci and --slow-ci in this change.

Changes:

* SPLITTESTDIRS: don't include test_inspect.
* Add utils.process_cpu_count() using len(os.sched_getaffinity(0)).
* test_regrtest doesn't use @support.without_optimizer which doesn't
  exist in Python 3.12.
* Add support.set_sanitizer_env_var().
* Update test_faulthandler to use support.set_sanitizer_env_var().
vstinner added a commit to vstinner/cpython that referenced this issue Oct 12, 2023
@vstinner
pythongh-110756: Sync regrtest with main branch
d996ab5 
* Remove runtest.py and runtest_mp.py of Lib/test/libregrtest/.
* Backport support._parse_memlimit().
@bedevere-app bedevere-app bot mentioned this issue Oct 12, 2023
Merged
vstinner added a commit to vstinner/cpython that referenced this issue Oct 12, 2023
@vstinner
pythongh-110756: Sync regrtest with main branch (python#110758)
f452cdf 
pythongh-110756: Sync regrtest with main branch

Copy files from main to this branch:

* Lib/test/libregrtest/*.py
* Lib/test/__init__.py
* Lib/test/__main__.py
* Lib/test/autotest.py
* Lib/test/pythoninfo.py
* Lib/test/regrtest.py
* Lib/test/test_regrtest.py

Copy also changes from:

* Lib/test/support/__init__.py
* Lib/test/support/os_helper.py
* Lib/test/support/testresult.py
* Lib/test/support/threading_helper.py
* Lib/test/test_support.py

Do not modify scripts running tests such as Makefile.pre.in,
.github/workflows/build.yml or Tools/scripts/run_tests.py: do not use
--fast-ci and --slow-ci in this change.

Changes:

* SPLITTESTDIRS: don't include test_inspect.
* Add utils.process_cpu_count() using len(os.sched_getaffinity(0)).
* test_regrtest doesn't use @support.without_optimizer which doesn't
  exist in Python 3.11.
* Add support.set_sanitizer_env_var().
* Update test_faulthandler to use support.set_sanitizer_env_var().
* @support.without_optimizer doesn't exist in 3.11.
* Add support.Py_DEBUG.
* regrtest.refleak: 3.11 doesn't have sys.getunicodeinternedsize.
@vstinner vstinner mentioned this issue Oct 12, 2023
Merged
vstinner added a commit that referenced this issue Oct 12, 2023
@vstinner
[3.12] gh-110756: Sync regrtest with main branch (#110779)
80f9585 
gh-110756: Sync regrtest with main branch

* Remove runtest.py and runtest_mp.py of Lib/test/libregrtest/.
* Backport support._parse_memlimit().
vstinner added a commit that referenced this issue Oct 12, 2023
@vstinner
gh-110756: Sync regrtest with main branch (#110758) (#110781)
26748ed 
Copy files from main to this branch:

* Lib/test/libregrtest/*.py
* Lib/test/__init__.py
* Lib/test/__main__.py
* Lib/test/autotest.py
* Lib/test/pythoninfo.py
* Lib/test/regrtest.py
* Lib/test/test_regrtest.py

Copy also changes from:

* Lib/test/support/__init__.py
* Lib/test/support/os_helper.py
* Lib/test/support/testresult.py
* Lib/test/support/threading_helper.py
* Lib/test/test_support.py

Do not modify scripts running tests such as Makefile.pre.in,
.github/workflows/build.yml or Tools/scripts/run_tests.py: do not use
--fast-ci and --slow-ci in this change.

Changes:

* SPLITTESTDIRS: don't include test_inspect.
* Add utils.process_cpu_count() using len(os.sched_getaffinity(0)).
* test_regrtest doesn't use @support.without_optimizer which doesn't
  exist in Python 3.11.
* Add support.set_sanitizer_env_var().
* Update test_faulthandler to use support.set_sanitizer_env_var().
* @support.without_optimizer doesn't exist in 3.11.
* Add support.Py_DEBUG.
* regrtest.refleak: 3.11 doesn't have sys.getunicodeinternedsize.
@bedevere-app bedevere-app bot mentioned this issue Oct 17, 2023
Merged
vstinner added a commit that referenced this issue Oct 17, 2023
@vstinner
[3.11] gh-110756: Fix libregrtest clear_caches() for distutils (#111011)
4ccd418 
gh-110756: Fix libregrtest clear_caches() for distutils

Restore code removed by recent sync with the main branch which no
longer has distutils:
commit 26748ed.
@neonene neonene mentioned this issue Nov 10, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
tests Tests in the Lib/test dir
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@vstinner