Get a few more test passing on WASI

Author: markshannon

Include/pythonrun.h

@@ -29,6 +29,9 @@ PyAPI_DATA(int) (*PyOS_InputHook)(void);
 #  define PYOS_STACK_MARGIN 4096
 #elif defined(Py_DEBUG) && defined(WIN32)
 #  define PYOS_STACK_MARGIN 3072
+#elif defined(__wasi__)
+   /* Web assembly has two stacks, so this isn't really a size */
+#  define PYOS_STACK_MARGIN 500
 #else
 #  define PYOS_STACK_MARGIN 2048
 #endif

Lib/test/test_class.py

@@ -2,7 +2,7 @@
 
 import unittest
 from test import support
-from test.support import cpython_only, import_helper, script_helper, skip_emscripten_stack_overflow
+from test.support import cpython_only, import_helper, script_helper
 
 testmeths = [
 
@@ -556,7 +556,8 @@ class Custom:
         self.assertFalse(hasattr(o, "__call__"))
         self.assertFalse(hasattr(c, "__call__"))
 
-    @skip_emscripten_stack_overflow()
+    @support.skip_emscripten_stack_overflow()
+    @support.skip_wasi_stack_overflow()
     def testSFBug532646(self):
         # Test for SF bug 532646
 

Lib/test/test_dynamic.py

@@ -134,7 +134,7 @@ def test_eval_gives_lambda_custom_globals(self):
 
         self.assertEqual(foo(), 7)
 
-    @unittest.skipIf(is_wasi and Py_DEBUG, "requires too much stack")
+    @unittest.skipIf(is_wasi, "requires too much stack")
     def test_load_global_specialization_failure_keeps_oparg(self):
         # https://github.com/python/cpython/issues/91625
         class MyGlobals(dict):

Lib/test/test_patma.py

@@ -3498,6 +3498,7 @@ def f(command):               # 0
         self.assertListEqual(self._trace(f, 1), [1, 2, 3])
         self.assertListEqual(self._trace(f, 0), [1, 2, 5, 6])
 
+    @support.skip_wasi_stack_overflow()
     def test_parser_deeply_nested_patterns(self):
         # Deeply nested patterns can cause exponential backtracking when parsing.
         # See gh-93671 for more information.

Python/ceval.c

@@ -338,7 +338,7 @@ _Py_EnterRecursiveCallUnchecked(PyThreadState *tstate)
 #  define Py_C_STACK_SIZE 1600000
 #elif defined(__wasi__)
    /* Web assembly has two stacks, so this isn't really the stack depth */
-#  define Py_C_STACK_SIZE 100000
+#  define Py_C_STACK_SIZE 80000
 #elif defined(__hppa__) || defined(__powerpc64__)
 #  define Py_C_STACK_SIZE 2000000
 #else