diff options
Diffstat (limited to 'tests/meson.build')
| -rw-r--r-- | tests/meson.build | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/tests/meson.build b/tests/meson.build index d61d094..8370423 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -33,7 +33,7 @@ test('public-exports', python, args: [files('helpers/check_exports.py')] + expor foreach unit : ['contracts', 'utf8', 'timers', 'loop', 'selection', 'events', 'gl_options'] exe = executable('yasl-' + unit + '-test', 'common/test_' + unit + '.c', include_directories: inc, dependencies: yasl_dep) - test(unit, exe) + test(unit, exe, is_parallel: not has_cocoa or unit != 'timers') endforeach keyboard_sources = files('common/test_keyboard.c') if not has_wayland @@ -80,10 +80,14 @@ if has_x11 endif endif if get_option('integration_tests') - integration = executable('yasl-surface-integration', 'common/test_surface_integration.c', + display_test_sources = has_cocoa ? files('cocoa/display.m') : [] + integration = executable('yasl-surface-integration', ['common/test_surface_integration.c'] + display_test_sources, include_directories: inc, dependencies: yasl_dep) - gl_integration = executable('yasl-gl-integration', 'common/test_gl.c', - dependencies: yasl_dep) + gl_integration = '-' + if has_egl + gl_integration = executable('yasl-gl-integration', 'common/test_gl.c', + dependencies: yasl_dep) + endif vulkan_integration = '-' if has_vulkan vulkan_integration = executable('yasl-vulkan-integration', 'common/test_vulkan.c', dependencies: yasl_dep) @@ -99,12 +103,12 @@ if get_option('integration_tests') test('reconnect-wayland', python, args: [files('helpers/run_reconnect.py'), weston, reconnect], timeout: 60) endif elif has_cocoa - test('surface-cocoa', integration, args: ['cocoa'], timeout: 30) + test('surface-cocoa', integration, args: ['cocoa'], timeout: 30, is_parallel: false) foreach unit : ['native', 'ownership', 'keyboard', 'tablet', 'cursor'] extension = unit == 'native' ? '.c' : '.m' exe = executable('yasl-' + unit + '-cocoa-test', 'cocoa/test_' + unit + extension, include_directories: inc, dependencies: yasl_dep) - test(unit + '-cocoa', exe, timeout: 30) + test(unit + '-cocoa', exe, timeout: 30, is_parallel: false) endforeach endif endif |
