8000 [3.12] gh-109615: Fix support test_copy_python_src_ignore() (#109958) by vstinner · Pull Request #110340 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

[3.12] gh-109615: Fix support test_copy_python_src_ignore() (#109958) #110340

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

Merged
merged 4 commits into from
Oct 4, 2023
Merged

[3.12] gh-109615: Fix support test_copy_python_src_ignore() (#109958) #110340

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b24ecb7
gh-109615: Fix support test_copy_python_src_ignore() (#109958)
vstinner Sep 27, 2023
c310ecb
gh-109615: Fix support test_copy_python_src_ignore() on WASM (#109970)
vstinner Sep 27, 2023
4f4c799
gh-109615: Look for 'Modules' as landmark for test_copy_python_src_ig…
zooba Sep 29, 2023
a334057
gh-109748: Fix again venv test_zippath_from_non_installed_posix() (#1…
vstinner Sep 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
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 b89ed9d)
  • Loading branch information
@vstinner
vstinner committed Oct 4, 2023
commit b24ecb7639a9f558240d4d69df0e4094eba6a51b
12 changes: 7 additions & 5 deletions Lib/test/libregrtest/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,11 +747,13 @@ def set_temp_dir(self):
if sysconfig.is_python_build():
self.tmp_dir = sysconfig.get_config_var('abs_builddir')
if self.tmp_dir is None:
# gh-74470: On Windows, only srcdir is available. Using
# abs_builddir mostly matters on UNIX when building Python
# out of the source tree, especially when the source tree
# is read only.
self.tmp_dir = sysconfig.get_config_var('srcdir')
self.tmp_dir = sysconfig.get_config_var('abs_srcdir')
if not self.tmp_dir:
# gh-74470: On Windows, only srcdir is available. Using
# abs_builddir mostly matters on UNIX when building
# Python out of the source tree, especially when the
# source tree is read only.
self.tmp_dir = sysconfig.get_config_var('srcdir')
self.tmp_dir = os.path.join(self.tmp_dir, 'build')
else:
self.tmp_dir = tempfile.gettempdir()
Expand Down
2 changes: 2 additions & 0 deletions Lib/test/pythoninfo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,8 @@ def collect_sysconfig(info_add):
'Py_ENABLE_SHARED',
'SHELL',
'SOABI',
'abs_builddir',
'abs_srcdir',
'prefix',
):
value = sysconfig.get_config_var(name)
Expand Down
7 changes: 6 additions & 1 deletion Lib/test/test_support.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,8 +767,13 @@ def recursive_function(depth):
#self.assertEqual(available, 2)

def test_copy_python_src_ignore(self):
src_dir = sysconfig.get_config_var('srcdir')
src_dir = sysconfig.get_config_var('abs_srcdir')
if not src_dir:
src_dir = sysconfig.get_config_var('srcdir')
src_dir = os.path.abspath(src_dir)
if not os.path.exists(src_dir):
self.skipTest(f"cannot access Python source code directory:"
f" {src_dir!r}")

ignored = {'.git', '__pycache__'}

Expand Down
9 changes: 8 additions & 1 deletion Tools/freeze/test/freeze.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,16 @@
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')
Expand Down
9 changes: 8 additions & 1 deletion Tools/patchcheck/patchcheck.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,21 @@
import untabify


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)


# Excluded directories which are copies of external libraries:
# don't check their coding style
EXCLUDE_DIRS = [
os.path.join('Modules', '_decimal', 'libmpdec'),
os.path.join('Modules', 'expat'),
os.path.join('Modules', 'zlib'),
]
SRCDIR = sysconfig.get_config_var('srcdir')
SRCDIR = get_python_source_dir()


def n_files_str(count):
Expand Down
0