[gtk/wip/otte/reftests: 1/4] reftests: Actually build a module
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/otte/reftests: 1/4] reftests: Actually build a module
- Date: Wed, 27 Mar 2019 04:24:18 +0000 (UTC)
commit 530cbd49807e3e586b4163e25a5ff1b8d9da049b
Author: Benjamin Otte <otte redhat com>
Date: Wed Mar 27 04:52:59 2019 +0100
reftests: Actually build a module
Reftests are expecting a module called libreftest.so, so don't build a
static libgtkreftest.a but what they expect.
testsuite/reftests/meson.build | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/testsuite/reftests/meson.build b/testsuite/reftests/meson.build
index 7b758ca550..de8176b1c4 100644
--- a/testsuite/reftests/meson.build
+++ b/testsuite/reftests/meson.build
@@ -3,15 +3,17 @@ libgtkreftestprivate = static_library('gtkreftestprivate',
'reftest-compare.c', 'reftest-module.c', 'reftest-snapshot.c',
dependencies : libgtk_dep)
-libreftest = static_library('gtkreftest',
- 'expand-expander.c',
- 'frame-inhibitor.c',
- 'letter-spacing.c',
- 'set-default-direction.c',
- 'statusbar-remove-all.c',
- 'textview-border-windows.c',
- 'textview-tags.c',
- 'animation-direction.c',
+libreftest = shared_module('reftest',
+ [ 'expand-expander.c',
+ 'frame-inhibitor.c',
+ 'letter-spacing.c',
+ 'set-default-direction.c',
+ 'statusbar-remove-all.c',
+ 'textview-border-windows.c',
+ 'textview-tags.c',
+ 'animation-direction.c',
+ ],
+ link_with: libgtkreftestprivate,
dependencies : libgtk_dep)
tcdata = configuration_data()
@@ -428,13 +430,13 @@ foreach testname : testdata
args: [ '--tap', '-k', '--verbose', join_paths(meson.current_source_dir(), testname) ],
env: [ 'GIO_USE_VOLUME_MONITOR=unix',
'GSETTINGS_BACKEND=memory',
- 'GSETTINGS_SCHEMA_DIR=@@'.format(gtk_schema_build_dir),
+ 'GSETTINGS_SCHEMA_DIR=@0@'.format(gtk_schema_build_dir),
'GTK_CSD=1',
'G_ENABLE_DIAGNOSTIC=0',
'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()),
'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
'GSK_RENDERER=opengl',
- 'REFTEST_MODULE_DIR=@@'.format(meson.current_build_dir()),
+ 'REFTEST_MODULE_DIR=@0@'.format(meson.current_build_dir()),
],
suite: 'reftest')
endforeach
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]