https://github.com/python/cpython/commit/03f78397039760085b8ec07969835c89610bbc6d
commit: 03f78397039760085b8ec07969835c89610bbc6d
branch: main
author: Brett Cannon <[email protected]>
committer: brettcannon <[email protected]>
date: 2024-01-16T11:36:41-08:00
summary:
GH-114013: fix setting `HOSTRUNNER` for `Tools/wasm/wasi.py` (GH-114097)
Also fix tests found failing under a pydebug build of WASI thanks to `make
test` working due to this change.
files:
A Misc/NEWS.d/next/Build/2024-01-15-16-58-43.gh-issue-114013.FoSeQf.rst
M Lib/test/test_isinstance.py
M Lib/test/test_richcmp.py
M Lib/test/test_typing.py
M Lib/test/test_userdict.py
M Lib/test/test_userlist.py
M Lib/test/test_xml_etree.py
M Tools/wasm/wasi.py
diff --git a/Lib/test/test_isinstance.py b/Lib/test/test_isinstance.py
index 791981b878b1f2..7f759fb3317146 100644
--- a/Lib/test/test_isinstance.py
+++ b/Lib/test/test_isinstance.py
@@ -310,7 +310,7 @@ class X:
@property
def __bases__(self):
return self.__bases__
- with support.infinite_recursion():
+ with support.infinite_recursion(25):
self.assertRaises(RecursionError, issubclass, X(), int)
self.assertRaises(RecursionError, issubclass, int, X())
self.assertRaises(RecursionError, isinstance, 1, X())
diff --git a/Lib/test/test_richcmp.py b/Lib/test/test_richcmp.py
index 6fb31c80d7e670..5f449cdc05c6ba 100644
--- a/Lib/test/test_richcmp.py
+++ b/Lib/test/test_richcmp.py
@@ -221,7 +221,7 @@ def do(bad):
self.assertRaises(Exc, func, Bad())
@support.no_tracing
- @support.infinite_recursion()
+ @support.infinite_recursion(25)
def test_recursion(self):
# Check that comparison for recursive objects fails gracefully
from collections import UserList
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index 8edab0cd6e34db..b684af4f33ed71 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -5684,7 +5684,7 @@ def fun(x: a): pass
def cmp(o1, o2):
return o1 == o2
- with infinite_recursion():
+ with infinite_recursion(25):
r1 = namespace1()
r2 = namespace2()
self.assertIsNot(r1, r2)
diff --git a/Lib/test/test_userdict.py b/Lib/test/test_userdict.py
index 9a03f2d04ce970..61e79f553e8ec9 100644
--- a/Lib/test/test_userdict.py
+++ b/Lib/test/test_userdict.py
@@ -215,7 +215,7 @@ class G(collections.UserDict):
# Decorate existing test with recursion limit, because
# the test is for C structure, but `UserDict` is a Python structure.
- test_repr_deep = support.infinite_recursion()(
+ test_repr_deep = support.infinite_recursion(25)(
mapping_tests.TestHashMappingProtocol.test_repr_deep,
)
diff --git a/Lib/test/test_userlist.py b/Lib/test/test_userlist.py
index 76d253753528b0..312702c8e398b9 100644
--- a/Lib/test/test_userlist.py
+++ b/Lib/test/test_userlist.py
@@ -69,7 +69,7 @@ def test_userlist_copy(self):
# Decorate existing test with recursion limit, because
# the test is for C structure, but `UserList` is a Python structure.
- test_repr_deep = support.infinite_recursion()(
+ test_repr_deep = support.infinite_recursion(25)(
list_tests.CommonTest.test_repr_deep,
)
diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
index 80ee064896f59a..b9e7937b0bbc00 100644
--- a/Lib/test/test_xml_etree.py
+++ b/Lib/test/test_xml_etree.py
@@ -2535,7 +2535,7 @@ def __eq__(self, o):
e.extend([ET.Element('bar')])
self.assertRaises(ValueError, e.remove, X('baz'))
- @support.infinite_recursion()
+ @support.infinite_recursion(25)
def test_recursive_repr(self):
# Issue #25455
e = ET.Element('foo')
diff --git
a/Misc/NEWS.d/next/Build/2024-01-15-16-58-43.gh-issue-114013.FoSeQf.rst
b/Misc/NEWS.d/next/Build/2024-01-15-16-58-43.gh-issue-114013.FoSeQf.rst
new file mode 100644
index 00000000000000..115050280016f9
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2024-01-15-16-58-43.gh-issue-114013.FoSeQf.rst
@@ -0,0 +1,4 @@
+Fix ``Tools/wasm/wasi.py`` to not include the path to ``python.wasm`` as
+part of ``HOSTRUNNER``. The environment variable is meant to specify how to
+run the WASI host only, having ``python.wasm`` and relevant flags appended
+to the ``HOSTRUNNER``. This fixes ``make test`` work.
diff --git a/Tools/wasm/wasi.py b/Tools/wasm/wasi.py
index 34c0e9375e24c8..36bc70ffd9db7b 100644
--- a/Tools/wasm/wasi.py
+++ b/Tools/wasm/wasi.py
@@ -233,9 +233,10 @@ def configure_wasi_python(context, working_dir):
env=updated_env(env_additions | wasi_sdk_env(context)),
quiet=context.quiet)
+ python_wasm = working_dir / "python.wasm"
exec_script = working_dir / "python.sh"
with exec_script.open("w", encoding="utf-8") as file:
- file.write(f'#!/bin/sh\nexec {host_runner} "$@"\n')
+ file.write(f'#!/bin/sh\nexec {host_runner} {python_wasm} "$@"\n')
exec_script.chmod(0o755)
print(f"🏃♀️ Created {exec_script} ... ")
sys.stdout.flush()
@@ -272,9 +273,7 @@ def main():
# Map the checkout to / to load the stdlib from /Lib.
"--dir {HOST_DIR}::{GUEST_DIR} "
# Set PYTHONPATH to the sysconfig data.
- "--env {ENV_VAR_NAME}={ENV_VAR_VALUE} "
- # Path to the WASM binary.
- "{PYTHON_WASM}")
+ "--env {ENV_VAR_NAME}={ENV_VAR_VALUE}")
parser = argparse.ArgumentParser()
subcommands = parser.add_subparsers(dest="subcommand")
@@ -310,8 +309,8 @@ def main():
"$WASI_SDK_PATH or /opt/wasi-sdk")
subcommand.add_argument("--host-runner", action="store",
default=default_host_runner, dest="host_runner",
- help="Command template for running the WebAssembly "
- "code (default meant for wasmtime 14 or newer: "
+ help="Command template for running the WASI host "
+ "(default designed for wasmtime 14 or newer: "
f"`{default_host_runner}`)")
context = parser.parse_args()
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
