[gnome-builder/wip/gtk4-port] tests: make GI_TYPELIB_PATH deterministic
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder/wip/gtk4-port] tests: make GI_TYPELIB_PATH deterministic
- Date: Wed, 4 May 2022 01:10:08 +0000 (UTC)
commit 350760848f73bda10df390f3964e7681ffa77628
Author: Christian Hergert <chergert redhat com>
Date: Tue May 3 18:10:00 2022 -0700
tests: make GI_TYPELIB_PATH deterministic
This didn't even expand properly, so it was broken to begin with. But now
it actually appears to have the proper includes for our test to run far
enough to fail elsewhere.
src/tests/meson.build | 26 +++++++++++++++++++-------
1 file changed, 19 insertions(+), 7 deletions(-)
---
diff --git a/src/tests/meson.build b/src/tests/meson.build
index 0755db912..0fe3011ed 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -1,14 +1,26 @@
-template_libdir = dependency('template-glib-1.0').get_variable('libdir')
-gsv_libdir = dependency('gtksourceview-5').get_variable('libdir')
-
-typelib_dirs = [
+gi_typelib_path = [
'@0@/src'.format(meson.project_build_root()),
- join_paths(template_libdir, 'girepository-1.0'),
- join_paths(gsv_libdir, 'girepository-1.0'),
]
+typelib_deps = [
+ libadwaita_dep,
+ libgio_dep,
+ libgtk_dep,
+ libgtksource_dep,
+ libjson_glib_dep,
+ libjsonrpc_glib_dep,
+ libpanel_dep,
+ libpeas_dep,
+ libtemplate_glib_dep,
+ libvte_dep,
+]
+
+foreach typelib_dep: typelib_deps
+ gi_typelib_path += [join_paths(typelib_dep.get_variable('libdir'), 'girepository-1.0')]
+endforeach
+
test_env = [
- 'GI_TYPELIB_PATH="@0@:$(GI_TYPELIB_PATH)"'.format(':'.join(typelib_dirs)),
+ 'GI_TYPELIB_PATH=@0@'.format(':'.join(gi_typelib_path)),
'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()),
'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
'G_DEBUG=gc-friendly',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]