[libgee/meson] Meson: Unit Tests ported to Meson
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgee/meson] Meson: Unit Tests ported to Meson
- Date: Mon, 15 May 2017 15:02:48 +0000 (UTC)
commit 8e931bc334b2cba6d1311c30c8de034619bbfdbe
Author: Daniel Espinosa <daniel espinosa pwmc mx>
Date: Mon May 15 09:55:08 2017 -0500
Meson: Unit Tests ported to Meson
* Removed internal headers and VAPI generation, because
no one is using them, they are not installed or distributed
* Unit Tests ported to Meson, pass all
gee/meson.build | 1 +
meson.build | 8 +++++---
tests/meson.build | 8 ++++----
3 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/gee/meson.build b/gee/meson.build
index 2d90e12..cd58a0f 100644
--- a/gee/meson.build
+++ b/gee/meson.build
@@ -92,6 +92,7 @@ valasources = files ([
sources = files ([])
includehdir = include_directories ('.')
+includehdir_dep = declare_dependency (include_directories : includehdir)
includehdir_dep = declare_dependency (include_directories : includehdir)
diff --git a/meson.build b/meson.build
index 994b98c..57e257f 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,8 @@
project('libgee', [ 'vala', 'c'])
+add_project_arguments (['--vapidir', join_paths (meson.source_root (),'utils')],
+ language: 'vala')
+
gio = dependency('gio-2.0')
VALADEPS = 'gio-2.0'
@@ -33,8 +36,7 @@ configure_file(input : 'gee.deps.in',
install_dir : vapidir)
-
subdir('utils')
subdir('gee')
-#subdir('doc')
-#subdir('tests')
+subdir('doc')
+subdir('tests')
diff --git a/tests/meson.build b/tests/meson.build
index f35005a..24b2bad 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -41,10 +41,10 @@ testf = files ([
])
t = executable('tests',
- testf + utilsvapi,
- vala_args : [''],
- dependencies : [ gio, includehdir_dep, include_utils_h_dir_dep ],
+ testf,
+ vala_args : ['--pkg', 'geeutils', '--pkg', 'posix'],
+ dependencies : [ gio, include_utils_h_dir_dep, includehdir_dep ],
link_with: gee
)
-test ('gee', t)
+test ('tests', t)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]