[gnome-logs] build: Drop build option for tests
- From: Jonathan Kang <jonathankang src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-logs] build: Drop build option for tests
- Date: Fri, 17 May 2019 07:40:54 +0000 (UTC)
commit 9cbec9c12e076160b379b5c583c5e373c76719b8
Author: Jonathan Kang <jonathankang gnome org>
Date: Fri May 17 15:35:24 2019 +0800
build: Drop build option for tests
meson.build | 28 ----------------------------
meson_options.txt | 1 -
tests/meson.build | 16 +++++++---------
3 files changed, 7 insertions(+), 38 deletions(-)
---
diff --git a/meson.build b/meson.build
index 6e61d52..0f504d2 100644
--- a/meson.build
+++ b/meson.build
@@ -74,34 +74,6 @@ gl_deps = [
dependency('libsystemd')
]
-# Testing utilities
-have_desktop_file_validate = false
-if get_option('tests')
- desktop_file_validate = find_program('desktop-file-validate', required : false)
- if desktop_file_validate.found()
- have_desktop_file_validate = true
- else
- have_desktop_file_validate = false
- endif
-else
- have_desktop_file_validate = false
-endif
-
-if have_desktop_file_validate == true
- testing_utilities = true
-else
- testing_utilities = false
- if get_option('tests')
- error('tests were requested but the required utilities were not found')
- endif
-endif
-
-if testing_utilities
- logs_enable_tests = true
-else
- logs_enable_tests = false
-endif
-
# Manpage
have_xsltproc = false
have_manutils = false
diff --git a/meson_options.txt b/meson_options.txt
index 51ebbdd..d98cbd9 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,2 +1 @@
-option('tests', type : 'boolean', value : false, description : 'Enable support for tests run during make
check')
option('man', type : 'boolean', value : false, description : 'Enable building the man page')
diff --git a/tests/meson.build b/tests/meson.build
index 7b5cde5..a51878c 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -11,12 +11,10 @@ test_gl_util_sources = files(
'../src/gl-util.c'
)
-if logs_enable_tests
- selftest = executable(
- 'test-gl-util',
- sources : test_gl_util_sources,
- include_directories : [top_inc, src_inc],
- dependencies : gl_deps
- )
- test('test-gl-util', selftest, env : tests_env)
-endif
+selftest = executable(
+ 'test-gl-util',
+ sources : test_gl_util_sources,
+ include_directories : [top_inc, src_inc],
+ dependencies : gl_deps
+)
+test('test-gl-util', selftest, env : tests_env)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]