Fix GSettings testcase again

Hopefully this one will work for both srcdir == builddir and not.

diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
index 5ac09d1..6fef7b6 100644 (file)
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
@@ -318,7 +318,7 @@ test.mo: de.po
        cp -f test.mo de/LC_MESSAGES
 EXTRA_DIST += de.po
 dist_uninstalled_test_data += \
-       org.gtk.test.gschema.xml                \
+       org.gtk.test.gschema.xml.orig           \
        org.gtk.schemasourcecheck.gschema.xml   \
        testenum.h                              \
        enums.xml.template

diff --git a/gio/tests/gsettings.c b/gio/tests/gsettings.c
index 18156d6..522e583 100644 (file)
--- a/gio/tests/gsettings.c
+++ b/gio/tests/gsettings.c
@@ -2412,11 +2412,14 @@ main (int argc, char *argv[])
       g_assert (g_file_set_contents ("org.gtk.test.enums.xml", enums, -1, NULL));
       g_free (enums);
 
-      g_assert (g_file_get_contents (SRCDIR "/org.gtk.test.gschema.xml", &schema_text, NULL, NULL));
+      g_assert (g_file_get_contents (SRCDIR "/org.gtk.test.gschema.xml.orig", &schema_text, NULL, NULL));
       g_assert (g_file_set_contents ("org.gtk.test.gschema.xml", schema_text, -1, NULL));
 
       g_remove ("gschemas.compiled");
-      g_assert (g_spawn_command_line_sync ("../glib-compile-schemas .", NULL, NULL, &result, NULL));
+      g_assert (g_spawn_command_line_sync ("../glib-compile-schemas --targetdir=. "
+                                           "--schema-file=org.gtk.test.enums.xml "
+                                           "--schema-file=org.gtk.test.gschema.xml",
+                                           NULL, NULL, &result, NULL));
       g_assert (result == 0);
 
       g_remove ("schema-source/gschemas.compiled");

diff --git a/gio/tests/org.gtk.test.gschema.xml b/gio/tests/org.gtk.test.gschema.xml.orig
similarity index 100%
rename from gio/tests/org.gtk.test.gschema.xml
rename to gio/tests/org.gtk.test.gschema.xml.orig