diff options
author | Christoph Reiter <creiter@src.gnome.org> | 2018-02-17 09:48:12 +0100 |
---|---|---|
committer | Christoph Reiter <creiter@src.gnome.org> | 2018-02-17 09:48:12 +0100 |
commit | 1253e7bfcbc80f88328a923568be63f831941a39 (patch) | |
tree | 7afc4148c4844a0c0346238b4bf22137a759e172 /testsuite/gtk/defaultvalue.c | |
parent | 1b8a768279e1cf093b16c6c71965aa5cb1c80682 (diff) | |
download | gtk+-1253e7bfcbc80f88328a923568be63f831941a39.tar.gz |
tests: Make GSETTINGS_SCHEMA_DIR point to the compiled schemas in the build dir
With autotools the schemas were compiled into each test suite directory
and the tests set GSETTINGS_SCHEMA_DIR to the test build directory.
With meson's gnome.compile_schemas() we can not define a target directory
so just make sure it is built in the gtk directory and set GSETTINGS_SCHEMA_DIR
to the gtk build directory when running the tests.
This makes the gtk+:gtk suite pass when no gtk is installed on the system.
Diffstat (limited to 'testsuite/gtk/defaultvalue.c')
-rw-r--r-- | testsuite/gtk/defaultvalue.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/testsuite/gtk/defaultvalue.c b/testsuite/gtk/defaultvalue.c index 1be85556c3..f011682fc4 100644 --- a/testsuite/gtk/defaultvalue.c +++ b/testsuite/gtk/defaultvalue.c @@ -367,7 +367,6 @@ main (int argc, char **argv) { const GType *otypes; guint i; - gchar *schema_dir; GTestDBus *bus; GMainLoop *loop; gint result; @@ -380,10 +379,6 @@ main (int argc, char **argv) gtk_test_init (&argc, &argv); gtk_test_register_all_types(); - /* g_test_build_filename must be called after gtk_test_init */ - schema_dir = g_test_build_filename (G_TEST_BUILT, "", NULL); - g_setenv ("GSETTINGS_SCHEMA_DIR", schema_dir, TRUE); - /* Create one test bus for all tests, as we have a lot of very small * and quick tests. */ @@ -418,7 +413,6 @@ main (int argc, char **argv) g_test_dbus_down (bus); g_object_unref (bus); - g_free (schema_dir); return result; } |