Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test-fix-a11y-schema' into 'gtk-3-22'

Browse Source 
testsuite/a11y: Fix missing glib schemas

See merge request GNOME/gtk!16
This commit is contained in:
Matthias Clasen
2018-02-19 18:23:11 +00:00
parent c96be5a00b c60ea284c5
commit 146b1e0d42
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
testsuite/a11y/Makefile.am
View File

@@ -101,6 +101,22 @@ test_in_files = \
EXTRA_DIST += $(test_in_files) $(testdata)
GTK_GSETTINGS_SCHEMAS = \
$(top_srcdir)/gtk/org.gtk.Settings.ColorChooser.gschema.xml \
$(top_srcdir)/gtk/org.gtk.Settings.FileChooser.gschema.xml \
$(NULL)
gschemas.compiled: $(GTK_GSETTINGS_SCHEMAS)
$(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) \
$(addprefix --schema-file=,$(GTK_GSETTINGS_SCHEMAS)) \
--targetdir=$(builddir)
BUILT_SOURCES = gschemas.compiled
CLEANFILES = gschemas.compiled
all-am: gschemas.compiled
if BUILDOPT_INSTALL_TESTS
insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)
insttest_PROGRAMS = $(TEST_PROGS)

5
testsuite/a11y/accessibility-dump.c
View File

@@ -858,6 +858,7 @@ parse_command_line (int *argc, char ***argv)
{
GError *error = NULL;
GOptionContext *context;
gchar *schema_dir;
context = g_option_context_new ("- run GTK accessibility tests");
g_option_context_add_main_entries (context, test_args, NULL);
@@ -871,6 +872,10 @@ parse_command_line (int *argc, char ***argv)
gtk_test_init (argc, argv);
schema_dir = g_test_build_filename (G_TEST_BUILT, "", NULL);
g_setenv ("GSETTINGS_SCHEMA_DIR", schema_dir, TRUE);
g_free (schema_dir);
/* gtk_test_init does not call setlocale(), so do it ourselves,
* since running in the C locale breaks some our fancy
* utf8 output.