diff options
| author | Tomas Krizek <tomas.krizek@nic.cz> | 2019-02-04 19:24:19 +0100 |
|---|---|---|
| committer | Tomas Krizek <tomas.krizek@nic.cz> | 2019-03-12 10:43:22 +0100 |
| commit | 040b27b9d7809267a82c8881e5620f7690095a8a (patch) | |
| tree | c58ddc78bc4236e3b040dfa2c2cc31105813bc20 /tests/integration | |
| parent | meson: doc - add python breathe dependency check (diff) | |
| download | knot-resolver-040b27b9d7809267a82c8881e5620f7690095a8a.tar.xz knot-resolver-040b27b9d7809267a82c8881e5620f7690095a8a.zip | |
meson: tests/pytests - add extra_tests build option
Diffstat (limited to 'tests/integration')
| -rw-r--r-- | tests/integration/meson.build | 59 |
1 files changed, 32 insertions, 27 deletions
diff --git a/tests/integration/meson.build b/tests/integration/meson.build index 3472a354..4797fd04 100644 --- a/tests/integration/meson.build +++ b/tests/integration/meson.build @@ -1,30 +1,35 @@ -prepare_deckard = find_program('../../scripts/test-integration-prepare.sh') +if get_option('extra_tests') + prepare_deckard = find_program('../../scripts/test-integration-prepare.sh') -deckard_contrib = custom_target( - 'deckard_contrib', - command: [ - prepare_deckard, - '@0@'.format(join_paths(meson.current_source_dir())), - ], - output: 'deckard_contrib', - build_always_stale: true, -) + # deckard dependencies + cmake = find_program('cmake') # for libswrapper -deckard_env = environment() -deckard_env.prepend('PATH', kresd_install_path) + deckard_contrib = custom_target( + 'deckard_contrib', + command: [ + prepare_deckard, + '@0@'.format(join_paths(meson.current_source_dir())), + ], + output: 'deckard_contrib', + build_always_stale: true, + ) -deckard_kresd_run = find_program('deckard/kresd_run.sh') -test( - 'integration.deckard', - deckard_kresd_run, - env: deckard_env, - suite: [ - 'postinstall', - 'integration', - ], - is_parallel: false, - timeout: 180, # TODO - #workdir: join_paths(meson.current_source_dir(), 'deckard'), - depends: deckard_contrib, - build_by_default: false, -) + deckard_env = environment() + deckard_env.prepend('PATH', kresd_install_path) + + deckard_kresd_run = find_program('deckard/kresd_run.sh') + test( + 'integration.deckard', + deckard_kresd_run, + env: deckard_env, + suite: [ + 'postinstall', + 'integration', + ], + is_parallel: false, + timeout: 180, # TODO + #workdir: join_paths(meson.current_source_dir(), 'deckard'), + depends: deckard_contrib, + build_by_default: false, + ) +endif |