From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Thu, 11 Apr 2024 10:22:17 +0000 (+0200) Subject: [3.12] gh-117711: Only check for 'test/wheeldata' when it's actually used (GH-117712... X-Git-Tag: v3.12.4~254 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b681d60a6501e6c733546bc87c8631b23b80e45;p=thirdparty%2FPython%2Fcpython.git [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 <33810531+befeleme@users.noreply.github.com> Co-authored-by: Miro Hrončok --- diff --git a/Lib/test/test_tools/test_makefile.py b/Lib/test/test_tools/test_makefile.py index 17a1a6d0d38d..e253bd0049ff 100644 --- a/Lib/test/test_tools/test_makefile.py +++ b/Lib/test/test_tools/test_makefile.py @@ -66,6 +66,10 @@ class TestMakefile(unittest.TestCase): ) 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))