mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-02-23 18:52:09 +01:00
gio/tests/gsettings: Write subprocess stdout as test message
This won't confuse the meson TAP parser.
This commit is contained in:
parent
e0685a28ec
commit
ee7afedade
@ -3007,6 +3007,8 @@ main (int argc, char *argv[])
|
|||||||
if (!g_test_subprocess ())
|
if (!g_test_subprocess ())
|
||||||
{
|
{
|
||||||
GError *local_error = NULL;
|
GError *local_error = NULL;
|
||||||
|
char *subprocess_stdout = NULL;
|
||||||
|
|
||||||
/* A GVDB header is 6 guint32s, and requires a magic number in the first
|
/* A GVDB header is 6 guint32s, and requires a magic number in the first
|
||||||
* two guint32s. A set of zero bytes of a greater length is considered
|
* two guint32s. A set of zero bytes of a greater length is considered
|
||||||
* corrupt. */
|
* corrupt. */
|
||||||
@ -3046,14 +3048,20 @@ main (int argc, char *argv[])
|
|||||||
"--schema-file=org.gtk.test.enums.xml "
|
"--schema-file=org.gtk.test.enums.xml "
|
||||||
"--schema-file=org.gtk.test.gschema.xml "
|
"--schema-file=org.gtk.test.gschema.xml "
|
||||||
"--override-file=org.gtk.test.gschema.override",
|
"--override-file=org.gtk.test.gschema.override",
|
||||||
NULL, NULL, &result, NULL));
|
&subprocess_stdout, NULL, &result, NULL));
|
||||||
|
if (subprocess_stdout && *g_strstrip (subprocess_stdout) != '\0')
|
||||||
|
g_test_message ("%s", subprocess_stdout);
|
||||||
|
g_clear_pointer (&subprocess_stdout, g_free);
|
||||||
g_assert_cmpint (result, ==, 0);
|
g_assert_cmpint (result, ==, 0);
|
||||||
|
|
||||||
g_remove ("schema-source/gschemas.compiled");
|
g_remove ("schema-source/gschemas.compiled");
|
||||||
g_mkdir ("schema-source", 0777);
|
g_mkdir ("schema-source", 0777);
|
||||||
g_assert_true (g_spawn_command_line_sync (GLIB_COMPILE_SCHEMAS " --targetdir=schema-source "
|
g_assert_true (g_spawn_command_line_sync (GLIB_COMPILE_SCHEMAS " --targetdir=schema-source "
|
||||||
"--schema-file=" SRCDIR "/org.gtk.schemasourcecheck.gschema.xml",
|
"--schema-file=" SRCDIR "/org.gtk.schemasourcecheck.gschema.xml",
|
||||||
NULL, NULL, &result, NULL));
|
&subprocess_stdout, NULL, &result, NULL));
|
||||||
|
if (subprocess_stdout && *g_strstrip (subprocess_stdout) != '\0')
|
||||||
|
g_test_message ("%s", subprocess_stdout);
|
||||||
|
g_clear_pointer (&subprocess_stdout, g_free);
|
||||||
g_assert_cmpint (result, ==, 0);
|
g_assert_cmpint (result, ==, 0);
|
||||||
|
|
||||||
g_remove ("schema-source-corrupt/gschemas.compiled");
|
g_remove ("schema-source-corrupt/gschemas.compiled");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user