summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-12-02 17:37:38 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-12-05 22:28:13 +0000
commitb0351d61721669fafeaeb1b7217709e38e3f2266 (patch)
tree931975628021778b258f65222ff70f7775ff73c6 /meta
parent644914efa83a289da154c888b5661b9d16eaa35b (diff)
downloadpoky-b0351d61721669fafeaeb1b7217709e38e3f2266.tar.gz
python3: fix tests on x86 (32 bit)
(From OE-Core rev: 8de9d28a57cae405dd76aa2bca7a81507718817d) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/python/python3/0001-test_marshal.py-add-more-elements-in-test_determinis.patch27
-rw-r--r--meta/recipes-devtools/python/python3_3.11.0.bb1
2 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python3/0001-test_marshal.py-add-more-elements-in-test_determinis.patch b/meta/recipes-devtools/python/python3/0001-test_marshal.py-add-more-elements-in-test_determinis.patch
new file mode 100644
index 0000000000..9da7f94255
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-test_marshal.py-add-more-elements-in-test_determinis.patch
@@ -0,0 +1,27 @@
1From 076a4f9ab06105b94c87386c0dfe17b823502a13 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Thu, 1 Dec 2022 19:02:51 +0100
4Subject: [PATCH] test_marshal.py: add more elements in test_deterministic_sets
5
6Existing elements do produce different output on x86_64, but they
7do not on x86. Let's make the data longer to ensure it differs.
8
9Upstream-Status: Submitted [https://github.com/python/cpython/pull/99935]
10Signed-off-by: Alexander Kanavin <alex@linutronix.de>
11---
12 Lib/test/test_marshal.py | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/Lib/test/test_marshal.py b/Lib/test/test_marshal.py
16index aae86cc..29d95ad 100644
17--- a/Lib/test/test_marshal.py
18+++ b/Lib/test/test_marshal.py
19@@ -352,7 +352,7 @@ class BugsTestCase(unittest.TestCase):
20 for elements in (
21 "float('nan'), b'a', b'b', b'c', 'x', 'y', 'z'",
22 # Also test for bad interactions with backreferencing:
23- "('Spam', 0), ('Spam', 1), ('Spam', 2)",
24+ "('Spam', 0), ('Spam', 1), ('Spam', 2), ('Spam', 3), ('Spam', 4), ('Spam', 5)",
25 ):
26 s = f"{kind}([{elements}])"
27 with self.subTest(s):
diff --git a/meta/recipes-devtools/python/python3_3.11.0.bb b/meta/recipes-devtools/python/python3_3.11.0.bb
index 16a9e04cc9..c4fa8c65cd 100644
--- a/meta/recipes-devtools/python/python3_3.11.0.bb
+++ b/meta/recipes-devtools/python/python3_3.11.0.bb
@@ -35,6 +35,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
35 file://deterministic_imports.patch \ 35 file://deterministic_imports.patch \
36 file://0001-Avoid-shebang-overflow-on-python-config.py.patch \ 36 file://0001-Avoid-shebang-overflow-on-python-config.py.patch \
37 file://cve-2022-37460.patch \ 37 file://cve-2022-37460.patch \
38 file://0001-test_marshal.py-add-more-elements-in-test_determinis.patch \
38 " 39 "
39 40
40SRC_URI:append:class-native = " \ 41SRC_URI:append:class-native = " \