Skip to content

Commit ce9a85e

Browse files
committed
Update 3.13 patch
1 parent f510212 commit ce9a85e

File tree

1 file changed

+20
-12
lines changed

1 file changed

+20
-12
lines changed

python/3.13/musl-skip_failing_tests.patch

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
1-
commit 5e047972f7c80e95c2baecc9da86ee049df0b9c1
2-
Author: Marc Mueller <[email protected]>
3-
Date: 2024-10-11 20:11:47 +0200
1+
From 24e0dd64b30f81e8bb8266c17243d79235d1a3c6 Mon Sep 17 00:00:00 2001
2+
From: Marc Mueller <[email protected]>
3+
Date: Fri, 11 Oct 2024 20:11:47 +0200
4+
Subject: [PATCH] Skip failing tests on musl
45

5-
Skip failing tests on musl
6+
---
7+
Lib/test/support/__init__.py | 1 +
8+
Lib/test/test_math.py | 4 ++--
9+
Lib/test/test_re.py | 6 +++---
10+
3 files changed, 6 insertions(+), 5 deletions(-)
611

712
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
8-
index ed23f73e3cf..ccc36f7e774 100644
13+
index 7938b46012c..318fd3f8381 100644
914
--- a/Lib/test/support/__init__.py
1015
+++ b/Lib/test/support/__init__.py
11-
@@ -561,6 +561,7 @@ def skip_if_suppress_immortalization():
16+
@@ -555,6 +555,7 @@ def skip_if_suppress_immortalization():
1217
# have subprocess or fork support.
1318
is_emscripten = sys.platform == "emscripten"
1419
is_wasi = sys.platform == "wasi"
@@ -17,7 +22,7 @@ index ed23f73e3cf..ccc36f7e774 100644
1722
is_apple_mobile = sys.platform in {"ios", "tvos", "watchos"}
1823
is_apple = is_apple_mobile or sys.platform == "darwin"
1924
diff --git a/Lib/test/test_math.py b/Lib/test/test_math.py
20-
index 541ccdb3d09..4d5f8e982c8 100644
25+
index 96ec55a09b0..401ab70cf2a 100644
2126
--- a/Lib/test/test_math.py
2227
+++ b/Lib/test/test_math.py
2328
@@ -1,7 +1,7 @@
@@ -33,13 +38,13 @@ index 541ccdb3d09..4d5f8e982c8 100644
3338
# gh-73468: On some platforms, libc fma() doesn't implement IEE 754-2008
3439
# properly: it doesn't use the right sign when the result is zero.
3540
@unittest.skipIf(
36-
- sys.platform.startswith(("freebsd", "wasi"))
37-
+ sys.platform.startswith(("freebsd", "wasi")) or is_musl
41+
- sys.platform.startswith(("freebsd", "wasi", "netbsd"))
42+
+ sys.platform.startswith(("freebsd", "wasi", "netbsd")) or is_musl
3843
or (sys.platform == "android" and platform.machine() == "x86_64"),
3944
f"this platform doesn't implement IEE 754-2008 properly")
4045
def test_fma_zero_result(self):
4146
diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
42-
index 2a46e058e95..a630f79a702 100644
47+
index 813cb4a3f54..19713539fae 100644
4348
--- a/Lib/test/test_re.py
4449
+++ b/Lib/test/test_re.py
4550
@@ -1,6 +1,6 @@
@@ -50,7 +55,7 @@ index 2a46e058e95..a630f79a702 100644
5055
warnings_helper, SHORT_TIMEOUT, CPUStopwatch, requires_resource)
5156
import locale
5257
import re
53-
@@ -2016,7 +2016,7 @@ def test_bug_20998(self):
58+
@@ -2177,7 +2177,7 @@ def test_bug_20998(self):
5459
self.assertEqual(re.fullmatch('[a-c]+', 'ABC', re.I).span(), (0, 3))
5560

5661
@unittest.skipIf(
@@ -59,7 +64,7 @@ index 2a46e058e95..a630f79a702 100644
5964
"musl libc issue on Emscripten/WASI, bpo-46390"
6065
)
6166
def test_locale_caching(self):
62-
@@ -2056,7 +2056,7 @@ def check_en_US_utf8(self):
67+
@@ -2217,7 +2217,7 @@ def check_en_US_utf8(self):
6368
self.assertIsNone(re.match(b'(?Li)\xe5', b'\xc5'))
6469

6570
@unittest.skipIf(
@@ -68,3 +73,6 @@ index 2a46e058e95..a630f79a702 100644
6873
"musl libc issue on Emscripten/WASI, bpo-46390"
6974
)
7075
def test_locale_compiled(self):
76+
--
77+
2.47.1
78+

0 commit comments

Comments
 (0)