Skip to content
Snippets Groups Projects
Commit c1596716 authored by Florian Schmaus's avatar Florian Schmaus
Browse files

Merge branch 'parallel-tests' into 'master'

[tests] Run tests in parallel if io_uring is disabled

See merge request i4/manycore/emper!85
parents 75d444d3 a7b9bcd8
No related branches found
No related tags found
No related merge requests found
...@@ -16,7 +16,7 @@ tests = { ...@@ -16,7 +16,7 @@ tests = {
{ {
'description': 'Simplest fib test', 'description': 'Simplest fib test',
'test_suite': 'smoke', 'test_suite': 'smoke',
# 'is_parallel': true, 'is_parallel': true,
}, },
'c_api_test.c': 'c_api_test.c':
...@@ -63,14 +63,14 @@ tests = { ...@@ -63,14 +63,14 @@ tests = {
{ {
'description': 'Simple test for PrivateSemaphore:signalFromAnywhere()', 'description': 'Simple test for PrivateSemaphore:signalFromAnywhere()',
'test_suite': 'smoke', 'test_suite': 'smoke',
# 'is_parallel': true, 'is_parallel': true,
'test_runner': 'emper', 'test_runner': 'emper',
}, },
'TellActorFromAnywhereTest.cpp': 'TellActorFromAnywhereTest.cpp':
{ {
'description': 'Simple test for Actor:tellFromAnywhere()', 'description': 'Simple test for Actor:tellFromAnywhere()',
'test_suite': 'smoke', 'test_suite': 'smoke',
# 'is_parallel': true, 'is_parallel': true,
'test_runner': 'emper', 'test_runner': 'emper',
}, },
...@@ -159,6 +159,10 @@ test_env = environment( ...@@ -159,6 +159,10 @@ test_env = environment(
subdir('test-runner') subdir('test-runner')
io_uring_enabled = get_option('io')
parallel_ok = (not io_uring_enabled)
foreach source, test_dict : tests foreach source, test_dict : tests
# TODO: Use meson fs (filesystem) module once meson >= 0.53 is in # TODO: Use meson fs (filesystem) module once meson >= 0.53 is in
# buster-backports, instead of split('.')[0] # buster-backports, instead of split('.')[0]
...@@ -183,9 +187,11 @@ foreach source, test_dict : tests ...@@ -183,9 +187,11 @@ foreach source, test_dict : tests
dependencies: [emper_full_dep] + test_deps, dependencies: [emper_full_dep] + test_deps,
) )
test_is_parallel = test_dict.get('is_parallel', false)
test(test_name, test(test_name,
test_exe, test_exe,
is_parallel: test_dict.get('is_parallel', false), is_parallel: test_is_parallel and parallel_ok,
suite: test_dict.get('test_suite', 'all'), suite: test_dict.get('test_suite', 'all'),
env: test_env, env: test_env,
timeout: test_dict.get('timeout', 180), timeout: test_dict.get('timeout', 180),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment