[GR-59302] Fix downstream issues in tests

PullRequest: graalpython/3575

Author: msimacek

graalpython/com.oracle.graal.python.test/src/runner.py

@@ -66,8 +66,9 @@
 from textwrap import dedent
 
 DIR = Path(__file__).parent.resolve()
+GRAALPYTHON_DIR = DIR.parent.parent.resolve()
 UNIT_TEST_ROOT = (DIR / 'tests').resolve()
-TAGGED_TEST_ROOT = (DIR.parent.parent / 'lib-python' / '3' / 'test').resolve()
+TAGGED_TEST_ROOT = (GRAALPYTHON_DIR / 'lib-python' / '3' / 'test').resolve()
 IS_GRAALPY = sys.implementation.name == 'graalpy'
 
 
@@ -1197,7 +1198,7 @@ def main():
         args.failfast = True
 
     if IS_GRAALPY:
-        if get_bool_env('GRAALPYTEST_ALLOW_NO_JAVA_ASSERTIONS'):
+        if not get_bool_env('GRAALPYTEST_ALLOW_NO_JAVA_ASSERTIONS'):
             # noinspection PyUnresolvedReferences
             if not __graalpython__.java_assert():
                 sys.exit(
@@ -1206,13 +1207,13 @@ def main():
         if not hasattr(__graalpython__, 'tdebug'):
             sys.exit("Needs to be run with --experimental-options --python.EnableDebuggingBuiltins\n")
 
-    implicit_root = (TAGGED_TEST_ROOT if args.tagged else UNIT_TEST_ROOT).relative_to(Path('.').resolve())
+    implicit_root = Path(os.path.relpath(TAGGED_TEST_ROOT if args.tagged else UNIT_TEST_ROOT))
     for i, test in enumerate(args.tests):
-        if not test.test_file.is_absolute() and not test.test_file.resolve().is_relative_to(DIR.parent.parent):
+        if not test.test_file.is_absolute() and not test.test_file.resolve().is_relative_to(GRAALPYTHON_DIR):
             args.tests[i] = test.with_test_file(implicit_root / test.test_file)
     for i, ignore in enumerate(args.ignore):
         ignore_path = Path(ignore)
-        if not ignore_path.is_absolute() and not ignore_path.resolve().is_relative_to(DIR.parent.parent):
+        if not ignore_path.is_absolute() and not ignore_path.resolve().is_relative_to(GRAALPYTHON_DIR):
             args.ignore[i] = implicit_root / ignore_path
 
     partial = None

mx.graalpython/mx_graalpython.py

@@ -1107,10 +1107,13 @@ def is_included(path):
 
 def run_python_unittests(python_binary, args=None, paths=None, exclude=None, env=None,
                          use_pytest=False, cwd=None, lock=None, out=None, err=None, nonZeroIsFatal=True, timeout=None,
-                         report=False, parallel=1, runner_args=None):
+                         report=False, parallel=None, runner_args=None):
     if lock:
         lock.acquire()
 
+    if parallel is None:
+        parallel = 6 if paths is None else 1
+
     args = args or []
     args = [
         "--vm.ea",
@@ -1167,7 +1170,7 @@ def run_python_unittests(python_binary, args=None, paths=None, exclude=None, env
     if paths is not None:
         args += paths
     else:
-        args.append(os.path.relpath(SUITE.dir))
+        args.append(os.path.relpath(_python_unittest_root()))
 
     mx.logv(shlex.join([python_binary] + args))
     if lock:
@@ -1289,7 +1292,7 @@ def run_tagged_unittests(python_binary, env=None, cwd=None, nonZeroIsFatal=True,
     run_python_unittests(
         python_binary,
         runner_args=['--tagged', *runner_args],
-        paths=[os.path.relpath(SUITE.dir)],
+        paths=[os.path.relpath(os.path.join(_get_stdlib_home(), 'test'))],
         env=sub_env,
         cwd=cwd,
         nonZeroIsFatal=nonZeroIsFatal,
@@ -1388,19 +1391,19 @@ def graalpython_gate_runner(args, tasks):
 
     with Task('GraalPython sandboxed tests', tasks, tags=[GraalPythonTags.unittest_sandboxed]) as task:
         if task:
-            run_python_unittests(graalpy_standalone_jvm_enterprise(), args=SANDBOXED_OPTIONS, report=report(), parallel=6)
+            run_python_unittests(graalpy_standalone_jvm_enterprise(), args=SANDBOXED_OPTIONS, report=report())
 
     with Task('GraalPython multi-context unittests', tasks, tags=[GraalPythonTags.unittest_multi]) as task:
         if task:
-            run_python_unittests(graalpy_standalone_jvm(), args=["-multi-context"], nonZeroIsFatal=nonZeroIsFatal, parallel=6, report=report())
+            run_python_unittests(graalpy_standalone_jvm(), args=["-multi-context"], nonZeroIsFatal=nonZeroIsFatal, report=report())
 
     with Task('GraalPython Jython emulation tests', tasks, tags=[GraalPythonTags.unittest_jython]) as task:
         if task:
             run_python_unittests(graalpy_standalone_jvm(), args=["--python.EmulateJython"], paths=["test_interop.py"], report=report(), nonZeroIsFatal=nonZeroIsFatal)
 
     with Task('GraalPython with Arrow Storage Strategy', tasks, tags=[GraalPythonTags.unittest_arrow]) as task:
         if task:
-            run_python_unittests(graalpy_standalone_jvm(), args=["--python.UseNativePrimitiveStorageStrategy"], parallel=6, report=report(), nonZeroIsFatal=nonZeroIsFatal)
+            run_python_unittests(graalpy_standalone_jvm(), args=["--python.UseNativePrimitiveStorageStrategy"], report=report(), nonZeroIsFatal=nonZeroIsFatal)
 
     with Task('GraalPython HPy tests', tasks, tags=[GraalPythonTags.unittest_hpy]) as task:
         if task:
@@ -2561,7 +2564,7 @@ def python_coverage(args):
             elif kwds.pop("hpy", False):
                 run_hpy_unittests(executable, env=env, nonZeroIsFatal=False, timeout=5*60*60) # hpy unittests are really slow under coverage
             else:
-                run_python_unittests(executable, env=env, nonZeroIsFatal=False, timeout=3600, parallel=6, **kwds) # pylint: disable=unexpected-keyword-arg;
+                run_python_unittests(executable, env=env, nonZeroIsFatal=False, timeout=3600, **kwds) # pylint: disable=unexpected-keyword-arg;
 
         # generate a synthetic lcov file that includes all sources with 0
         # coverage. this is to ensure all sources actuall show up - otherwise,