[libgweather/wip/hadess/fix-utc-sunrise] fixup! tests: Add test for named timezone sunrise fetching



commit 5d8dbc50ae0bf50feeb9c73e298fe1902d1ec842
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Oct 8 13:57:14 2018 +0200

    fixup! tests: Add test for named timezone sunrise fetching

 libgweather/meson.build        | 4 +++-
 libgweather/test_libgweather.c | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/libgweather/meson.build b/libgweather/meson.build
index 4d907b9..47a1547 100644
--- a/libgweather/meson.build
+++ b/libgweather/meson.build
@@ -95,7 +95,9 @@ if enable_vala
   )
 endif
 
-test_cargs = ['-DTEST_SRCDIR="@0@/"'.format(meson.current_source_dir())]
+test_cargs = ['-DTEST_SRCDIR="@0@/"'.format(meson.current_source_dir()),
+              '-DSCHEMASDIR="@0@/schemas"'.format(meson.source_root()),
+              '-DSCHEMAS_BUILDDIR="@0@/schemas"'.format(meson.build_root())]
 
 executable('test_locations',
   ['test_locations.c'],
diff --git a/libgweather/test_libgweather.c b/libgweather/test_libgweather.c
index ab2942f..c6155d4 100644
--- a/libgweather/test_libgweather.c
+++ b/libgweather/test_libgweather.c
@@ -396,7 +396,7 @@ set_gsettings (void)
        cmdline = g_strdup_printf ("glib-compile-schemas --targetdir=%s "
                                   "--schema-file=%s/org.gnome.GWeather.enums.xml "
                                   "--schema-file=%s/org.gnome.GWeather.gschema.xml",
-                                  schemadir, TEST_SRCDIR "/../schemas", TEST_SRCDIR "/../schemas");
+                                  schemadir, SCHEMAS_BUILDDIR, SCHEMASDIR);
        g_assert (g_spawn_command_line_sync (cmdline, NULL, NULL, &result, NULL));
        g_assert (result == 0);
        g_free (cmdline);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]