Skip to content

Commit

Permalink
[3.12] gh-117711: Only check for 'test/wheeldata' when it's actually …
Browse files Browse the repository at this point in the history
…used (GH-117712) (#117749)

gh-117711: Only check for 'test/wheeldata' when it's actually used (GH-117712)

It's possible to build Python with option `--with-wheel-pkg-dir`
pointing to a custom wheel directory. Don't include the directory in the test
set if the wheels are used from a different location.

(cherry picked from commit d496387)

Co-authored-by: Karolina Surma <33810531+befeleme@users.noreply.github.com>
Co-authored-by: Miro Hrončok <miro@hroncok.cz>
3 people authored Apr 11, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 2a50857 commit 5b681d6
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions Lib/test/test_tools/test_makefile.py
Original file line number Diff line number Diff line change
@@ -66,6 +66,10 @@ def test_makefile_test_folders(self):
)
used.append(relpath)

# Don't check the wheel dir when Python is built --with-wheel-pkg-dir
if sysconfig.get_config_var('WHEEL_PKG_DIR'):
test_dirs.remove('test/wheeldata')

# Check that there are no extra entries:
unique_test_dirs = set(test_dirs)
self.assertSetEqual(unique_test_dirs, set(used))

0 comments on commit 5b681d6

Please sign in to comment.