https://github.com/python/cpython/commit/5b681d60a6501e6c733546bc87c8631b23b80e45
commit: 5b681d60a6501e6c733546bc87c8631b23b80e45
branch: 3.12
author: Miss Islington (bot) <[email protected]>
committer: vstinner <[email protected]>
date: 2024-04-11T10:22:17Z
summary:

[3.12] gh-117711: Only check for 'test/wheeldata' when it's actually 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 d4963871b03cc76fe7d9648d022d12007585beae)

Co-authored-by: Karolina Surma <[email protected]>
Co-authored-by: Miro HronĨok <[email protected]>

files:
M Lib/test/test_tools/test_makefile.py

diff --git a/Lib/test/test_tools/test_makefile.py 
b/Lib/test/test_tools/test_makefile.py
index 17a1a6d0d38d7d..e253bd0049ffa6 100644
--- a/Lib/test/test_tools/test_makefile.py
+++ b/Lib/test/test_tools/test_makefile.py
@@ -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))

_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]

Reply via email to