diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-10-01 20:28:48 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2018-11-04 15:42:06 +0000 |
| commit | 46d20219fcbeb19ba5aa0ed1e9065e33e2c23579 (patch) | |
| tree | 90c44ec632f47b30e1b079b92bd882502abad378 | |
| parent | 0eeb9316bee8202b7b896f83f92fdba8302a6c5c (diff) | |
| download | meson-46d20219fcbeb19ba5aa0ed1e9065e33e2c23579.zip meson-46d20219fcbeb19ba5aa0ed1e9065e33e2c23579.tar.gz meson-46d20219fcbeb19ba5aa0ed1e9065e33e2c23579.tar.bz2 | |
Skip test common/123 if masm not found
'test cases/common/123 llvm ir and assembly' requires ML/ML64 (masm) on
Windows. If we are using clang-cl, that might not be available, so skip
test in that case.
| -rw-r--r-- | test cases/common/123 llvm ir and assembly/meson.build | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/test cases/common/123 llvm ir and assembly/meson.build b/test cases/common/123 llvm ir and assembly/meson.build index 2f6034b..a67c6c6 100644 --- a/test cases/common/123 llvm ir and assembly/meson.build +++ b/test cases/common/123 llvm ir and assembly/meson.build @@ -31,12 +31,15 @@ foreach lang : ['c', 'cpp'] if cc.get_argument_syntax() == 'msvc' cl = cc.cmd_array() if cpu == 'x86' - ml = find_program('ml') + ml = find_program('ml', required: false) elif cpu == 'x86_64' - ml = find_program('ml64') + ml = find_program('ml64', required: false) else error('Unsupported cpu family: "' + cpu + '"') endif + if not ml.found() + error('MESON_SKIP_TEST: ML (masm) not found') + endif # Preprocess file (ml doesn't support pre-processing) preproc_name = lang + square_base + '.i' square_preproc = custom_target(lang + square_impl + 'preproc', |