luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-24 04:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests: Improve build of cmph tests in girepository

Browse Source 
They were still failing with `-Dglib_assert=false` because
`G_DISABLE_ASSERT` wasn’t being explicitly un-defined for the test.

See https://gitlab.gnome.org/GNOME/glib/-/jobs/3309889

Also while we’re there, take the opportunity to correctly set the test
suite, protocol and environment.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>
This commit is contained in:
Philip Withnall 2023-11-21 14:21:07 +00:00
parent f2d7e6af22
commit 2a7ff62417
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
girepository/cmph/meson.build
View File

@ -65,13 +65,22 @@ if cc.get_id() != 'msvc'
]) ])
endif endif
test_env = environment()
test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
cmph_test = executable('cmph-bdz-test', '../cmph-bdz-test.c', cmph_test = executable('cmph-bdz-test', '../cmph-bdz-test.c',
dependencies: [ dependencies: [
cmph_dep, cmph_dep,
libglib_dep, libglib_dep,
libgobject_dep, libgobject_dep,
], ],
c_args: custom_c_args, c_args: custom_c_args + ['-UG_DISABLE_ASSERT'],
) )
test('cmph-bdz-test', cmph_test) test('cmph-bdz-test', cmph_test,
env: test_env,
protocol: test_protocol,
suite: ['girepository'],
timeout: test_timeout,
)