Fix collecting tests under sandboxed

Author: msimacek

graalpython/lib-python/3/test/test_crypt.py

@@ -2,6 +2,9 @@
 import unittest
 from test.support import check_sanitizer, warnings_helper
 
+# GraalPy change:
+if sys.implementation.name == 'graalpy' and __graalpython__.posix_module_backend() == 'java':
+    raise unittest.SkipTest("Not supported on Java posix backend")
 
 try:
     if check_sanitizer(address=True, memory=True):

mx.graalpython/mx_graalpython.py

@@ -1101,23 +1101,30 @@ def graalpytest(args):
         PYTHONHASHSEED='0',
     )
 
-    cmd_args = []
+    python_args = []
+    runner_args = []
+    for arg in unknown_args:
+        if arg.startswith(('--python.', '--engine.', '--llvm.', '--vm.')):
+            python_args.append(arg)
+        else:
+            runner_args.append(arg)
     # if we got a binary path it's most likely CPython, so don't add graalpython args
     is_graalpy = False
     if not args.python:
         is_graalpy = True
-        cmd_args += ["--experimental-options=true", "--python.EnableDebuggingBuiltins"]
+        python_args += ["--experimental-options=true", "--python.EnableDebuggingBuiltins"]
     elif 'graalpy' in os.path.basename(args.python) or 'mxbuild' in args.python:
         is_graalpy = True
         gp_args = ["--vm.ea", "--vm.esa", "--experimental-options=true", "--python.EnableDebuggingBuiltins"]
         mx.log(f"Executable seems to be GraalPy, prepending arguments: {gp_args}")
-        cmd_args += gp_args
-    cmd_args += [_python_test_runner(), *unknown_args]
+        python_args += gp_args
+    runner_args += ['--subprocess-args', shlex.join(python_args)]
+    cmd_args = [*python_args, _python_test_runner(), *runner_args]
     delete_bad_env_keys(env)
     if is_graalpy:
         pythonpath = [os.path.join(_dev_pythonhome(), 'lib-python', '3')]
         pythonpath += [p for p in env.get('PYTHONPATH', '').split(os.pathsep) if p]
-        env['PYTONPATH'] = os.pathsep.join(pythonpath)
+        env['PYTHONPATH'] = os.pathsep.join(pythonpath)
     if args.python:
         return mx.run([args.python] + cmd_args, nonZeroIsFatal=True, env=env)
     else:
@@ -1163,7 +1170,6 @@ def run_python_unittests(python_binary, args=None, paths=None, aot_compatible=Fa
 
     args = args or []
     args = [
-        "-s",
         "--vm.ea",
         "--experimental-options=true",
         "--python.EnableDebuggingBuiltins",
@@ -1482,7 +1488,7 @@ def graalpython_gate_runner(args, tasks):
     with Task('GraalPython Python unittests with CPython', tasks, tags=[GraalPythonTags.unittest_cpython]) as task:
         if task:
             env = extend_os_env(PYTHONHASHSEED='0')
-            test_args = [get_cpython(), "-s", _python_test_runner(), "-n", "1", "graalpython/com.oracle.graal.python.test/src/tests"]
+            test_args = [get_cpython(), _python_test_runner(), "-n", "1", "graalpython/com.oracle.graal.python.test/src/tests"]
             mx.run(test_args, nonZeroIsFatal=True, env=env)
 
     with Task('GraalPython sandboxed tests', tasks, tags=[GraalPythonTags.unittest_sandboxed]) as task: