29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Karolina Surma <ksurma@redhat.com>
|
||
|
|
Date: Wed, 10 Apr 2024 15:35:04 +0200
|
||
|
|
Subject: [PATCH] 00425: Only check for 'test/wheeldata' when it's actually
|
||
|
|
used
|
||
|
|
|
||
|
|
We build Python in Fedora 39+ with option `--with-wheel-pkg-dir`
|
||
|
|
pointing to a custom wheel directory and delete the contents of
|
||
|
|
upstream's `test/wheeldata`. Don't include the directory in the test set
|
||
|
|
if the wheels are used from a different location.
|
||
|
|
---
|
||
|
|
Lib/test/test_tools/test_makefile.py | 3 +++
|
||
|
|
1 file changed, 3 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/Lib/test/test_tools/test_makefile.py b/Lib/test/test_tools/test_makefile.py
|
||
|
|
index 17a1a6d0d3..9ce874033d 100644
|
||
|
|
--- a/Lib/test/test_tools/test_makefile.py
|
||
|
|
+++ b/Lib/test/test_tools/test_makefile.py
|
||
|
|
@@ -66,6 +66,9 @@ def test_makefile_test_folders(self):
|
||
|
|
)
|
||
|
|
used.append(relpath)
|
||
|
|
|
||
|
|
+ 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))
|