mirror of
https://github.com/python/cpython.git
synced 2025-12-31 04:23:37 +00:00
[3.14] gh-138130: Fix return value of libc_ver() on Emscripten (GH-138132) (#138312)
Co-authored-by: Hood Chatham <roberthoodchatham@gmail.com>
This commit is contained in:
parent
07e0eb2093
commit
08d289208b
2 changed files with 8 additions and 1 deletions
|
|
@ -173,6 +173,11 @@ def libc_ver(executable=None, lib='', version='', chunksize=16384):
|
|||
|
||||
"""
|
||||
if not executable:
|
||||
if sys.platform == "emscripten":
|
||||
# Emscripten's os.confstr reports that it is glibc, so special case
|
||||
# it.
|
||||
ver = ".".join(str(x) for x in sys._emscripten_info.emscripten_version)
|
||||
return ("emscripten", ver)
|
||||
try:
|
||||
ver = os.confstr('CS_GNU_LIBC_VERSION')
|
||||
# parse 'glibc 2.28' as ('glibc', '2.28')
|
||||
|
|
|
|||
|
|
@ -525,8 +525,10 @@ def test_ios_ver(self):
|
|||
self.assertEqual(override.model, "Whiz")
|
||||
self.assertTrue(override.is_simulator)
|
||||
|
||||
@unittest.skipIf(support.is_emscripten, "Does not apply to Emscripten")
|
||||
def test_libc_ver(self):
|
||||
if support.is_emscripten:
|
||||
assert platform.libc_ver() == ("emscripten", "4.0.12")
|
||||
return
|
||||
# check that libc_ver(executable) doesn't raise an exception
|
||||
if os.path.isdir(sys.executable) and \
|
||||
os.path.exists(sys.executable+'.exe'):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue