luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-09 18:54:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

GSettings-related distcheck fixups

Browse Source
This commit is contained in:
Ryan Lortie
2010-06-17 10:50:47 -04:00
parent fcbddd746b
commit d352ec2bf3
2 changed files with 61 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
gio/tests/Makefile.am
View File

@@ -272,41 +272,66 @@ testapp_LDADD = $(progs_ldadd)
testapps_SOURCES = testapps.c gdbus-sessionbus.c gdbus-sessionbus.h testapps_SOURCES = testapps.c gdbus-sessionbus.c gdbus-sessionbus.h
testapps_LDADD = $(progs_ldadd) testapps_LDADD = $(progs_ldadd)
schema_tests = \
schema-tests/array-default-not-in-choices.gschema.xml \
schema-tests/bad-choice.gschema.xml \
schema-tests/bad-key.gschema.xml \
schema-tests/bad-key2.gschema.xml \
schema-tests/bad-key3.gschema.xml \
schema-tests/bad-key4.gschema.xml \
schema-tests/bad-type.gschema.xml \
schema-tests/bare-alias.gschema.xml \
schema-tests/choice-alias.gschema.xml \
schema-tests/choice-bad.gschema.xml \
schema-tests/choice-badtype.gschema.xml \
schema-tests/choice-invalid-alias.gschema.xml \
schema-tests/choice-missing-value.gschema.xml \
schema-tests/choice-shadowed-alias.gschema.xml \
schema-tests/choice-upside-down.gschema.xml \
schema-tests/choice.gschema.xml \
schema-tests/choices-wrong-type.gschema.xml \
schema-tests/default-in-aliases.gschema.xml \
schema-tests/default-not-in-choices.gschema.xml \
schema-tests/default-out-of-range.gschema.xml \
schema-tests/empty-key.gschema.xml \
schema-tests/enum-with-aliases.gschema.xml \
schema-tests/enum-with-bad-default.gschema.xml \
schema-tests/enum-with-chained-alias.gschema.xml \
schema-tests/enum-with-choice.gschema.xml \
schema-tests/enum-with-invalid-alias.gschema.xml \
schema-tests/enum-with-repeated-alias.gschema.xml \
schema-tests/enum-with-shadow-alias.gschema.xml \
schema-tests/enum.gschema.xml \
schema-tests/incomplete-list.gschema.xml \
schema-tests/invalid-path.gschema.xml \
schema-tests/missing-quotes.gschema.xml \
schema-tests/no-default.gschema.xml \
schema-tests/overflow.gschema.xml \
schema-tests/range-badtype.gschema.xml \
schema-tests/range-default-high.gschema.xml \
schema-tests/range-default-low.gschema.xml \
schema-tests/range-high-default.gschema.xml \
schema-tests/range-low-default.gschema.xml \
schema-tests/range-missing-max.gschema.xml \
schema-tests/range-missing-min.gschema.xml \
schema-tests/range-parse-error.gschema.xml \
schema-tests/range-wrong-type.gschema.xml \
schema-tests/range.gschema.xml \
schema-tests/wrong-category.gschema.xml
EXTRA_DIST += \ EXTRA_DIST += \
socket-common.c \ socket-common.c \
org.gtk.test.gschema \ org.gtk.test.gschema \
org.gtk.test.gschema.xml \ org.gtk.test.gschema.xml \
de.po \ testenum.h \
schema-tests/bad-type.gschema.xml \ enums.xml.template \
schema-tests/incomplete-list.gschema.xml \ de.po \
schema-tests/missing-quotes.gschema.xml \ $(schema_tests) \
schema-tests/no-default.gschema.xml \ appinfo-test.desktop \
schema-tests/wrong-category.gschema.xml \
schema-tests/overflow.gschema.xml \
schema-tests/bad-key.gschema.xml \
schema-tests/bad-key2.gschema.xml \
schema-tests/bad-key3.gschema.xml \
schema-tests/bad-key4.gschema.xml \
schema-tests/empty-key.gschema.xml \
schema-tests/array-default-not-in-choices.gschema.xml \
schema-tests/bad-type.gschema.xml \
schema-tests/choice-missing-value.gschema.xml \
schema-tests/choices-wrong-type.gschema.xml \
schema-tests/default-not-in-choices.gschema.xml \
schema-tests/default-out-of-range.gschema.xml \
schema-tests/incomplete-list.gschema.xml \
schema-tests/missing-quotes.gschema.xml \
schema-tests/no-default.gschema.xml \
schema-tests/overflow.gschema.xml \
schema-tests/range-missing-max.gschema.xml \
schema-tests/range-missing-min.gschema.xml \
schema-tests/range-wrong-type.gschema.xml \
schema-tests/wrong-category.gschema.xml \
schema-tests/invalid-path.gschema.xml \
appinfo-test.desktop \
gdbus-testserver.py gdbus-testserver.py
MISC_STUFF = gschemas.compiled test.mo MISC_STUFF = test.mo
test.mo: de.po test.mo: de.po
$(MSGFMT) -o test.mo $(srcdir)/de.po; \ $(MSGFMT) -o test.mo $(srcdir)/de.po; \
@@ -319,9 +344,6 @@ else
glib_compile_schemas=$(top_builddir)/gio/glib-compile-schemas glib_compile_schemas=$(top_builddir)/gio/glib-compile-schemas
endif endif
gschemas.compiled:
$(glib_compile_schemas) --targetdir=$(abs_builddir) $(srcdir)
DISTCLEANFILES = \ DISTCLEANFILES = \
applications/mimeinfo.cache \ applications/mimeinfo.cache \
de/LC_MESSAGES/test.mo \ de/LC_MESSAGES/test.mo \

6
gio/tests/gsettings.c
View File

@@ -1335,14 +1335,16 @@ main (int argc, char *argv[])
g_remove ("org.gtk.test.enums.xml"); g_remove ("org.gtk.test.enums.xml");
g_assert (g_spawn_command_line_sync ("../../gobject/glib-mkenums " g_assert (g_spawn_command_line_sync ("../../gobject/glib-mkenums "
"--template enums.xml.template " "--template " SRCDIR "/enums.xml.template "
SRCDIR "/testenum.h", SRCDIR "/testenum.h",
&enums, NULL, &result, NULL)); &enums, NULL, &result, NULL));
g_assert (result == 0); g_assert (result == 0);
g_assert (g_file_set_contents ("org.gtk.test.enums.xml", enums, -1, NULL)); g_assert (g_file_set_contents ("org.gtk.test.enums.xml", enums, -1, NULL));
g_remove ("gschemas.compiled"); g_remove ("gschemas.compiled");
g_assert (g_spawn_command_line_sync ("../glib-compile-schemas --targetdir=. " SRCDIR, g_assert (g_spawn_command_line_sync ("../glib-compile-schemas --targetdir=. "
"--schema-file=org.gtk.test.enums.xml "
"--schema-file=" SRCDIR "/org.gtk.test.gschema.xml",
NULL, NULL, &result, NULL)); NULL, NULL, &result, NULL));
g_assert (result == 0); g_assert (result == 0);