diff options
| author | Victor Stinner <vstinner@python.org> | 2023-10-04 10:27:12 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-04 10:27:12 (GMT) |
| commit | 8939221e91351f8e0a279f3019e2a3f65c3c95f9 (patch) | |
| tree | c3abe3680bbb7d1f484fa861ec003bab5df6a4f5 /Tools/freeze | |
| parent | e7a61d34b7897ac6cff53add2ec03309a5ff8350 (diff) | |
| download | cpython-8939221e91351f8e0a279f3019e2a3f65c3c95f9.zip cpython-8939221e91351f8e0a279f3019e2a3f65c3c95f9.tar.gz cpython-8939221e91351f8e0a279f3019e2a3f65c3c95f9.tar.bz2 | |
[3.12] gh-109615: Fix support test_copy_python_src_ignore() (#109958) (#110340)
* gh-109615: Fix support test_copy_python_src_ignore() (#109958)
Fix the test when run on an installed Python: use "abs_srcdir" of
sysconfig, and skip the test if the Python source code cannot be
found.
* Tools/patchcheck/patchcheck.py, Tools/freeze/test/freeze.py and
Lib/test/libregrtest/utils.py now first try to get "abs_srcdir"
from sysconfig, before getting "srcdir" from sysconfig.
* test.pythoninfo logs sysconfig "abs_srcdir".
(cherry picked from commit b89ed9df39851348fbb1552294644f99f6b17d2c)
* gh-109615: Fix support test_copy_python_src_ignore() on WASM (#109970)
Not only check if src_dir exists, but look also for Lib/os.py
landmark.
(cherry picked from commit cc54bcf17b5b5f7681f52baf3acef75b995fa1fd)
* gh-109615: Look for 'Modules' as landmark for test_copy_python_src_ignore (GH-110108)
(cherry picked from commit 20bc5f7c28a6f8a2e156c4a748ffabb5efc7c761)
* gh-109748: Fix again venv test_zippath_from_non_installed_posix() (#110149)
Call also copy_python_src_ignore() on listdir() names.
shutil.copytree(): replace set() with an empty tuple. An empty tuple
becomes a constant in the compiler and checking if an item is in an
empty tuple is cheap.
(cherry picked from commit 0def8c712bb6f66f1081cab71deb3681566b846d)
---------
Co-authored-by: Steve Dower <steve.dower@python.org>
Diffstat (limited to 'Tools/freeze')
| -rw-r--r-- | Tools/freeze/test/freeze.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Tools/freeze/test/freeze.py b/Tools/freeze/test/freeze.py index bb15941..cdf77c5 100644 --- a/Tools/freeze/test/freeze.py +++ b/Tools/freeze/test/freeze.py @@ -7,9 +7,16 @@ import sysconfig from test import support +def get_python_source_dir(): + src_dir = sysconfig.get_config_var('abs_srcdir') + if not src_dir: + src_dir = sysconfig.get_config_var('srcdir') + return os.path.abspath(src_dir) + + TESTS_DIR = os.path.dirname(__file__) TOOL_ROOT = os.path.dirname(TESTS_DIR) -SRCDIR = os.path.abspath(sysconfig.get_config_var('srcdir')) +SRCDIR = get_python_source_dir() MAKE = shutil.which('make') FREEZE = os.path.join(TOOL_ROOT, 'freeze.py') |