pidgin/pidgin

Make sure the unittests can find our compiled gsettings schemas

20 months ago, Gary Kramlich
c53f5d62e14f
Parents b26a160abce5
Children 0f8bd2f65c61
Make sure the unittests can find our compiled gsettings schemas

Testing Done:
Ran the unit tests and verified the ones failing about schemas were now passing.

Reviewed at https://reviews.imfreedom.org/r/1751/
3 files changed, 4 insertions(+), 1 deletions(-)
  • +1 -0
    libpurple/data/meson.build
  • +3 -0
    libpurple/meson.build
  • +0 -1
    libpurple/tests/meson.build
    • --- a/libpurple/data/meson.build Mon Sep 12 21:21:28 2022 -0500
    +++ b/libpurple/data/meson.build Mon Sep 12 21:30:53 2022 -0500
    @@ -22,3 +22,4 @@
    # Compile the schemas in the current directory; this is only useful for testing
    gnome.compile_schemas(depend_files: files(settings_schemas))
    +testenv.prepend('GSETTINGS_SCHEMA_DIR', meson.current_build_dir())
    --- a/libpurple/meson.build Mon Sep 12 21:21:28 2022 -0500
    +++ b/libpurple/meson.build Mon Sep 12 21:30:53 2022 -0500
    @@ -210,6 +210,9 @@
    purple_generated_sources = []
    +# An environment for unit tests.
    +testenv = environment()
    +
    purple_resource = gnome.compile_resources('purpleresources',
    'resources/libpurple.gresource.xml',
    source_dir : 'resources',
    --- a/libpurple/tests/meson.build Mon Sep 12 21:21:28 2022 -0500
    +++ b/libpurple/tests/meson.build Mon Sep 12 21:30:53 2022 -0500
    @@ -35,7 +35,6 @@
    dependencies: [libpurple_dep, glib]
    )
    -testenv = environment()
    testenv.set('XDG_CONFIG_HOME', meson.current_build_dir() / 'config')
    foreach prog : PROGS