We already have two options that influence how 'ninja test'
behaves and we're about to introduce a third one, so it makes
sense to give them consistent names.
Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx>
---
libvirt.spec.in | 2 +-
meson.build | 6 +++---
meson_options.txt | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 379cf0d9be..90aeb6210c 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1185,7 +1185,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec)
-Dqemu_group=%{qemu_group} \
-Dtls_priority=%{tls_priority} \
%{?enable_werror} \
- -Dexpensive_tests=enabled \
+ -Dtests_expensive=enabled \
-Dinit_script=systemd \
%{?arg_login_shell}
diff --git a/meson.build b/meson.build
index 33eaa9ff56..0820e4c895 100644
--- a/meson.build
+++ b/meson.build
@@ -127,14 +127,14 @@ endif
# test options
-if get_option('expensive_tests').auto()
+if get_option('tests_expensive').auto()
use_expensive_tests = not git
else
- use_expensive_tests = get_option('expensive_tests').enabled()
+ use_expensive_tests = get_option('tests_expensive').enabled()
endif
coverage_flags = []
-if get_option('test_coverage')
+if get_option('tests_coverage')
coverage_flags = [
'-fprofile-arcs',
'-ftest-coverage',
diff --git a/meson_options.txt b/meson_options.txt
index 7838630c1e..43ce9b83de 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -3,8 +3,8 @@ option('packager', type: 'string', value: '', description: 'Extra packager name'
option('packager_version', type: 'string', value: '', description: 'Extra packager version')
option('system', type: 'boolean', value: false, description: 'Set install paths to system ones')
option('runstatedir', type: 'string', value: '', description: 'State directory for temporary sockets, pid files, etc')
-option('expensive_tests', type: 'feature', value: 'auto', description: 'set the default for enabling expensive tests (long timeouts), use VIR_TEST_EXPENSIVE to override')
-option('test_coverage', type: 'boolean', value: false, description: 'turn on code coverage instrumentation')
+option('tests_expensive', type: 'feature', value: 'auto', description: 'set the default for enabling expensive tests (long timeouts), use VIR_TEST_EXPENSIVE to override')
+option('tests_coverage', type: 'boolean', value: false, description: 'turn on code coverage instrumentation')
option('git_werror', type: 'feature', value: 'auto', description: 'use -Werror if building from GIT')
option('rpath', type: 'feature', value: 'auto', description: 'whether to include rpath information in installed binaries and libraries')
--
2.26.2
