Skip to content

Commit 30be93b

Browse files
committed
Set default parallelism for unit tests
1 parent eb58828 commit 30be93b

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

mx.graalpython/mx_graalpython.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1107,10 +1107,13 @@ def is_included(path):
11071107

11081108
def run_python_unittests(python_binary, args=None, paths=None, exclude=None, env=None,
11091109
use_pytest=False, cwd=None, lock=None, out=None, err=None, nonZeroIsFatal=True, timeout=None,
1110-
report=False, parallel=1, runner_args=None):
1110+
report=False, parallel=None, runner_args=None):
11111111
if lock:
11121112
lock.acquire()
11131113

1114+
if parallel is None:
1115+
parallel = 6 if paths is None else 1
1116+
11141117
args = args or []
11151118
args = [
11161119
"--vm.ea",
@@ -1388,19 +1391,19 @@ def graalpython_gate_runner(args, tasks):
13881391

13891392
with Task('GraalPython sandboxed tests', tasks, tags=[GraalPythonTags.unittest_sandboxed]) as task:
13901393
if task:
1391-
run_python_unittests(graalpy_standalone_jvm_enterprise(), args=SANDBOXED_OPTIONS, report=report(), parallel=6)
1394+
run_python_unittests(graalpy_standalone_jvm_enterprise(), args=SANDBOXED_OPTIONS, report=report())
13921395

13931396
with Task('GraalPython multi-context unittests', tasks, tags=[GraalPythonTags.unittest_multi]) as task:
13941397
if task:
1395-
run_python_unittests(graalpy_standalone_jvm(), args=["-multi-context"], nonZeroIsFatal=nonZeroIsFatal, parallel=6, report=report())
1398+
run_python_unittests(graalpy_standalone_jvm(), args=["-multi-context"], nonZeroIsFatal=nonZeroIsFatal, report=report())
13961399

13971400
with Task('GraalPython Jython emulation tests', tasks, tags=[GraalPythonTags.unittest_jython]) as task:
13981401
if task:
13991402
run_python_unittests(graalpy_standalone_jvm(), args=["--python.EmulateJython"], paths=["test_interop.py"], report=report(), nonZeroIsFatal=nonZeroIsFatal)
14001403

14011404
with Task('GraalPython with Arrow Storage Strategy', tasks, tags=[GraalPythonTags.unittest_arrow]) as task:
14021405
if task:
1403-
run_python_unittests(graalpy_standalone_jvm(), args=["--python.UseNativePrimitiveStorageStrategy"], parallel=6, report=report(), nonZeroIsFatal=nonZeroIsFatal)
1406+
run_python_unittests(graalpy_standalone_jvm(), args=["--python.UseNativePrimitiveStorageStrategy"], report=report(), nonZeroIsFatal=nonZeroIsFatal)
14041407

14051408
with Task('GraalPython HPy tests', tasks, tags=[GraalPythonTags.unittest_hpy]) as task:
14061409
if task:
@@ -2561,7 +2564,7 @@ def python_coverage(args):
25612564
elif kwds.pop("hpy", False):
25622565
run_hpy_unittests(executable, env=env, nonZeroIsFatal=False, timeout=5*60*60) # hpy unittests are really slow under coverage
25632566
else:
2564-
run_python_unittests(executable, env=env, nonZeroIsFatal=False, timeout=3600, parallel=6, **kwds) # pylint: disable=unexpected-keyword-arg;
2567+
run_python_unittests(executable, env=env, nonZeroIsFatal=False, timeout=3600, **kwds) # pylint: disable=unexpected-keyword-arg;
25652568

25662569
# generate a synthetic lcov file that includes all sources with 0
25672570
# coverage. this is to ensure all sources actuall show up - otherwise,

0 commit comments

Comments
 (0)