summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Saunier <tsaunier@igalia.com>2019-02-25 13:50:10 -0300
committerThibault Saunier <tsaunier@igalia.com>2019-02-25 15:08:28 -0300
commit1fb754eb43be7a8600e57ebf16fcd11c2fe9f7a2 (patch)
tree21162cb98ffd32fcdb577e37e58308d0d5d4d9b7
parent24730900aac41673820dcfb3e9aa0f91396d047a (diff)
tests: Use mono-nunit if avalaible
-rw-r--r--Tests/meson.build25
1 files changed, 15 insertions, 10 deletions
diff --git a/Tests/meson.build b/Tests/meson.build
index 70e59e3..483fc94 100644
--- a/Tests/meson.build
+++ b/Tests/meson.build
@@ -1,4 +1,4 @@
-nunit_console = find_program('nunit-console', required: false)
+nunit_console = find_program('nunit-console', 'nunitlite-runner', required: get_option('tests'))
if nunit_console.found()
nunit_version = '3.10.1'
@@ -11,17 +11,22 @@ if nunit_console.found()
'--builddir', meson.build_root(),
)
- if get_nunit_res.returncode() != 0
- message('Failed to get NUnit: ' + get_nunit_res.stderr())
- else
- foreach path: get_nunit_res.stdout().split()
- testsenv.prepend('MONO_PATH',
- join_paths(meson.build_root(), path.strip('-r:'), '..'))
- endforeach
- nunit_dep = declare_dependency(link_args: get_nunit_res.stdout().split(),
- version: nunit_version)
+ nunit_dep = dependency('mono-nunit')
+ if not nunit_dep.found()
+ if get_nunit_res.returncode() != 0
+ message('Failed to get NUnit: ' + get_nunit_res.stderr())
+ else
+ foreach path: get_nunit_res.stdout().split()
+ testsenv.prepend('MONO_PATH',
+ join_paths(meson.build_root(), path.strip('-r:'), '..'))
+ endforeach
+ nunit_dep = declare_dependency(link_args: get_nunit_res.stdout().split(),
+ version: nunit_version)
+ endif
+ endif
+ if nunit_dep.found()
foreach test: [
# 'PipelineTests',
'SdpTests'