Merge remote-tracking branch 'gvdb/master'

[platform/upstream/glib.git] / gobject / tests / ifaceproperties.c

diff --git a/gobject/tests/ifaceproperties.c b/gobject/tests/ifaceproperties.c
index 22fc747..f7a260c 100644 (file)
--- a/gobject/tests/ifaceproperties.c
+++ b/gobject/tests/ifaceproperties.c
@@ -154,8 +154,8 @@ base_object_constructor (GType                  type,
   /* The constructor is the one place where a GParamSpecOverride is visible
    * to the outside world, so we do a bunch of checks here
    */
-  GValue value1 = { 0, };
-  GValue value2 = { 0, };
+  GValue value1 = G_VALUE_INIT;
+  GValue value2 = G_VALUE_INIT;
   GParamSpec *pspec;
 
   g_assert (n_construct_properties == 1);
@@ -615,6 +615,9 @@ base2_object_init (Base2Object *object)
 static void
 test_not_overridden (void)
 {
+  if (!g_test_undefined ())
+    return;
+
   g_test_bug ("637738");
 
   if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT|G_TEST_TRAP_SILENCE_STDERR))