Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-02-13 18:49:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

gh-141600: Fix musl version detection on Void Linux (GH-141602)

Browse source
This commit is contained in:
Andrew J. Hesford 2025-11-22 13:17:40 -05:00 • committed by GitHub
parent c41fce08a5
commit 08477dbf30
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/test/test_platform.py
View file

@ -569,6 +569,8 @@ def test_libc_ver(self):
(b'/aports/main/musl/src/musl-1.2.5.7', ('musl', '1.2.5.7')),
(b'libc.musl.so.1', ('musl', '1')),
(b'libc.musl-x86_64.so.1.2.5', ('musl', '1.2.5')),
(b'ld-musl.so.1', ('musl', '1')),
(b'ld-musl-x86_64.so.1.2.5', ('musl', '1.2.5')),
(b'', ('', '')),
):
with open(filename, 'wb') as fp:
@ -591,6 +593,10 @@ def test_libc_ver(self):
b'libc.musl-x86_64.so.1.4.1\0libc.musl-x86_64.so.2.1.1\0libc.musl-x86_64.so.2.0.1',
('musl', '2.1.1'),
),
(
b'ld-musl-x86_64.so.1.4.1\0ld-musl-x86_64.so.2.1.1\0ld-musl-x86_64.so.2.0.1',
('musl', '2.1.1'),
),
(b'no match here, so defaults are used', ('test', '100.1.0')),
):
with open(filename, 'wb') as f:

4
Lib/test/test_support.py
View file

@ -798,10 +798,10 @@ def test_linked_to_musl(self):
self.assertTrue(linked)
# The value is cached, so make sure it returns the same value again.
self.assertIs(linked, support.linked_to_musl())
# The unlike libc, the musl version is a triple.
# The musl version is either triple or just a major version number.
if linked:
self.assertIsInstance(linked, tuple)
self.assertEqual(3, len(linked))
self.assertIn(len(linked), (1, 3))
for v in linked:
self.assertIsInstance(v, int)