From 833e5bab330379797568007671d77e80e58ae388 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 22 Aug 2022 10:35:54 -0400 Subject: Only run autoship test in strict mode --- INSTALL.md | 4 ++++ test/meson.build | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 7109c35d..903e6805 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -39,6 +39,10 @@ Options can be set by passing C-style "define" options to `configure`: meson configure -Dc_args="-march=native" -Dprefix="/opt/mypackage/" +Note that some options, such as `strict` and `werror` are for +developer/maintainer use only. Please don't file issues about anything that +happens when they are enabled. + Building -------- diff --git a/test/meson.build b/test/meson.build index b38cee42..a1cac7ae 100644 --- a/test/meson.build +++ b/test/meson.build @@ -1,7 +1,6 @@ # Copyright 2021-2022 David Robillard # SPDX-License-Identifier: CC0-1.0 OR ISC -autoship = find_program('autoship', required: false) run_test_suite = files('run_test_suite.py') wrapper = meson.get_external_property('exe_wrapper', '') @@ -10,8 +9,11 @@ wrapper = meson.get_external_property('exe_wrapper', '') # Project Metadata # #################### -if autoship.found() - test('autoship', autoship, args: ['test', serd_src_root], suite: 'data') +if get_option('strict') and not meson.is_subproject() + autoship = find_program('autoship', required: false) + if autoship.found() + test('autoship', autoship, args: ['test', serd_src_root], suite: 'data') + endif endif ############## -- cgit v1.2.1