diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-10-09 16:50:31 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2018-11-04 15:42:06 +0000 |
| commit | 075168d492ac4e8f65d02aeab5297e07c61e87ed (patch) | |
| tree | afbc02813cb28ffc3b757d9dd643d4909c0a83e0 | |
| parent | 3c38e46774bb477c4d3ad26323a1e4b809d97b40 (diff) | |
| download | meson-075168d492ac4e8f65d02aeab5297e07c61e87ed.zip meson-075168d492ac4e8f65d02aeab5297e07c61e87ed.tar.gz meson-075168d492ac4e8f65d02aeab5297e07c61e87ed.tar.bz2 | |
Handle only llvm-objdump being available
llvm-objdump currently doesn't appear to output the Windows subsystem, so
that part of the test needs to be skipped.
| -rw-r--r-- | test cases/windows/16 gui app/meson.build | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/test cases/windows/16 gui app/meson.build b/test cases/windows/16 gui app/meson.build index 2435218..224d708 100644 --- a/test cases/windows/16 gui app/meson.build +++ b/test cases/windows/16 gui app/meson.build @@ -17,6 +17,10 @@ console_prog = executable('console_prog', 'console_prog.c', gui_app: false) tester = find_program('gui_app_tester.py') -tool = find_program('objdump', 'dumpbin') -test('is_gui', tester, args: [tool.path(), gui_prog, '2']) -test('not_gui', tester, args: [tool.path(), console_prog, '3']) +tool = find_program('objdump', 'dumpbin', required: false) +# TODO: when 'llvm-objdump -f' emits the subsystem type, we could use that also + +if tool.found() + test('is_gui', tester, args: [tool.path(), gui_prog, '2']) + test('not_gui', tester, args: [tool.path(), console_prog, '3']) +endif |