Skip to content

Commit

Permalink
Update 3.13 patch
Browse files Browse the repository at this point in the history
  • Loading branch information
cdce8p committed Dec 13, 2024
1 parent f510212 commit ce9a85e
Showing 1 changed file with 20 additions and 12 deletions.
32 changes: 20 additions & 12 deletions python/3.13/musl-skip_failing_tests.patch
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
commit 5e047972f7c80e95c2baecc9da86ee049df0b9c1
Author: Marc Mueller <[email protected]>
Date: 2024-10-11 20:11:47 +0200
From 24e0dd64b30f81e8bb8266c17243d79235d1a3c6 Mon Sep 17 00:00:00 2001
From: Marc Mueller <[email protected]>
Date: Fri, 11 Oct 2024 20:11:47 +0200
Subject: [PATCH] Skip failing tests on musl

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

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index ed23f73e3cf..ccc36f7e774 100644
index 7938b46012c..318fd3f8381 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -561,6 +561,7 @@ def skip_if_suppress_immortalization():
@@ -555,6 +555,7 @@ def skip_if_suppress_immortalization():
# have subprocess or fork support.
is_emscripten = sys.platform == "emscripten"
is_wasi = sys.platform == "wasi"
Expand All @@ -17,7 +22,7 @@ index ed23f73e3cf..ccc36f7e774 100644
is_apple_mobile = sys.platform in {"ios", "tvos", "watchos"}
is_apple = is_apple_mobile or sys.platform == "darwin"
diff --git a/Lib/test/test_math.py b/Lib/test/test_math.py
index 541ccdb3d09..4d5f8e982c8 100644
index 96ec55a09b0..401ab70cf2a 100644
--- a/Lib/test/test_math.py
+++ b/Lib/test/test_math.py
@@ -1,7 +1,7 @@
Expand All @@ -33,13 +38,13 @@ index 541ccdb3d09..4d5f8e982c8 100644
# gh-73468: On some platforms, libc fma() doesn't implement IEE 754-2008
# properly: it doesn't use the right sign when the result is zero.
@unittest.skipIf(
- sys.platform.startswith(("freebsd", "wasi"))
+ sys.platform.startswith(("freebsd", "wasi")) or is_musl
- sys.platform.startswith(("freebsd", "wasi", "netbsd"))
+ sys.platform.startswith(("freebsd", "wasi", "netbsd")) or is_musl
or (sys.platform == "android" and platform.machine() == "x86_64"),
f"this platform doesn't implement IEE 754-2008 properly")
def test_fma_zero_result(self):
diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
index 2a46e058e95..a630f79a702 100644
index 813cb4a3f54..19713539fae 100644
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@ -1,6 +1,6 @@
Expand All @@ -50,7 +55,7 @@ index 2a46e058e95..a630f79a702 100644
warnings_helper, SHORT_TIMEOUT, CPUStopwatch, requires_resource)
import locale
import re
@@ -2016,7 +2016,7 @@ def test_bug_20998(self):
@@ -2177,7 +2177,7 @@ def test_bug_20998(self):
self.assertEqual(re.fullmatch('[a-c]+', 'ABC', re.I).span(), (0, 3))

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

@unittest.skipIf(
Expand All @@ -68,3 +73,6 @@ index 2a46e058e95..a630f79a702 100644
"musl libc issue on Emscripten/WASI, bpo-46390"
)
def test_locale_compiled(self):
--
2.47.1

0 comments on commit ce9a85e

Please sign in to comment.