From eb906d85ca0fb06f26fab9ea59dbd979d9b243cb Mon Sep 17 00:00:00 2001
From: nobled <nobled@dreamwidth.org>
Date: Tue, 22 Feb 2011 00:19:35 +0000
Subject: [PATCH] tests: abort if clutter_init fails

This fixes segfaults when something goes wrong during
init, but the test keeps going anyway.

Except for test-easing and test-picking, these were fixed by
sed magic:

sed -i -s -e "s/clutter_init \?(&argc, &argv)/\
if (clutter_init (\&argc, \&argv) != CLUTTER_INIT_SUCCESS)\n\
    return 1/" tests/*/*.c

http://bugzilla.clutter-project.org/show_bug.cgi?id=2574
---
 tests/accessibility/cally-atkcomponent-example.c    |  3 ++-
 tests/accessibility/cally-atkeditabletext-example.c |  3 ++-
 tests/accessibility/cally-atkevents-example.c       |  3 ++-
 tests/accessibility/cally-atktext-example.c         |  3 ++-
 tests/accessibility/cally-clone-example.c           |  3 ++-
 tests/interactive/test-animation.c                  |  3 ++-
 tests/interactive/test-animator.c                   |  3 ++-
 tests/interactive/test-behave.c                     |  3 ++-
 tests/interactive/test-bin-layout.c                 |  3 ++-
 tests/interactive/test-binding-pool.c               |  3 ++-
 tests/interactive/test-box-layout.c                 |  3 ++-
 tests/interactive/test-cairo-flowers.c              |  3 ++-
 tests/interactive/test-clip.c                       |  3 ++-
 tests/interactive/test-cogl-multitexture.c          |  3 ++-
 tests/interactive/test-cogl-offscreen.c             |  3 ++-
 tests/interactive/test-cogl-point-sprites.c         |  3 ++-
 tests/interactive/test-cogl-primitives.c            |  3 ++-
 tests/interactive/test-cogl-shader-arbfp.c          |  3 ++-
 tests/interactive/test-cogl-shader-glsl.c           |  3 ++-
 tests/interactive/test-cogl-tex-convert.c           |  3 ++-
 tests/interactive/test-cogl-tex-foreign.c           |  3 ++-
 tests/interactive/test-cogl-tex-getset.c            |  3 ++-
 tests/interactive/test-cogl-tex-polygon.c           |  3 ++-
 tests/interactive/test-cogl-tex-tile.c              |  3 ++-
 tests/interactive/test-cogl-vertex-buffer.c         |  3 ++-
 tests/interactive/test-constraints.c                |  3 ++-
 tests/interactive/test-depth.c                      |  3 ++-
 tests/interactive/test-devices.c                    |  3 ++-
 tests/interactive/test-easing.c                     | 12 +++++++-----
 tests/interactive/test-events.c                     |  3 ++-
 tests/interactive/test-fbo.c                        |  3 ++-
 tests/interactive/test-fullscreen.c                 |  3 ++-
 tests/interactive/test-grab.c                       |  3 ++-
 tests/interactive/test-layout.c                     |  3 ++-
 tests/interactive/test-model.c                      |  3 ++-
 tests/interactive/test-multistage.c                 |  3 ++-
 tests/interactive/test-path-constraint.c            |  3 ++-
 tests/interactive/test-pixmap.c                     |  3 ++-
 tests/interactive/test-scale.c                      |  3 ++-
 tests/interactive/test-script.c                     |  3 ++-
 tests/interactive/test-scrolling.c                  |  3 ++-
 tests/interactive/test-shader-effects.c             |  3 ++-
 tests/interactive/test-shader.c                     |  3 ++-
 tests/interactive/test-snap-constraint.c            |  3 ++-
 tests/interactive/test-stage-read-pixels.c          |  3 ++-
 tests/interactive/test-stage-sizing.c               |  3 ++-
 tests/interactive/test-state-animator.c             |  3 ++-
 tests/interactive/test-state.c                      |  3 ++-
 tests/interactive/test-table-layout.c               |  3 ++-
 tests/interactive/test-text-field.c                 |  3 ++-
 tests/interactive/test-text.c                       |  3 ++-
 tests/interactive/test-texture-async.c              |  3 ++-
 tests/interactive/test-texture-material.c           |  3 ++-
 tests/interactive/test-texture-quality.c            |  3 ++-
 tests/interactive/test-textures.c                   |  3 ++-
 tests/interactive/test-threads.c                    |  3 ++-
 tests/interactive/test-unproject.c                  |  3 ++-
 tests/micro-bench/test-picking.c                    | 12 +++++++-----
 tests/micro-bench/test-random-text.c                |  3 ++-
 tests/micro-bench/test-text-perf.c                  |  3 ++-
 tests/micro-bench/test-text.c                       |  3 ++-
 61 files changed, 132 insertions(+), 69 deletions(-)

diff --git a/tests/accessibility/cally-atkcomponent-example.c b/tests/accessibility/cally-atkcomponent-example.c
index c50a1abaa..6698d97a4 100644
--- a/tests/accessibility/cally-atkcomponent-example.c
+++ b/tests/accessibility/cally-atkcomponent-example.c
@@ -47,7 +47,8 @@ main (int argc, char *argv[])
   ClutterGeometry geom = {0, 0, SIZE, SIZE};
   gint i = 0;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   cally_util_a11y_init (&argc, &argv);
 
diff --git a/tests/accessibility/cally-atkeditabletext-example.c b/tests/accessibility/cally-atkeditabletext-example.c
index 93ccc7b7b..454630216 100644
--- a/tests/accessibility/cally-atkeditabletext-example.c
+++ b/tests/accessibility/cally-atkeditabletext-example.c
@@ -251,7 +251,8 @@ main (int argc, char *argv[])
 
   g_set_application_name ("AtkEditableText");
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   cally_util_a11y_init (&argc, &argv);
 
diff --git a/tests/accessibility/cally-atkevents-example.c b/tests/accessibility/cally-atkevents-example.c
index 422e55a1b..fabfc6f11 100644
--- a/tests/accessibility/cally-atkevents-example.c
+++ b/tests/accessibility/cally-atkevents-example.c
@@ -141,7 +141,8 @@ main (int argc, char *argv[])
 
   g_set_application_name ("AtkText");
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   cally_util_a11y_init (&argc, &argv);
 
diff --git a/tests/accessibility/cally-atktext-example.c b/tests/accessibility/cally-atktext-example.c
index c456ec101..0543ed834 100644
--- a/tests/accessibility/cally-atktext-example.c
+++ b/tests/accessibility/cally-atktext-example.c
@@ -193,7 +193,8 @@ main (int argc, char *argv[])
 
   g_set_application_name ("AtkText");
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   cally_util_a11y_init (&argc, &argv);
 
diff --git a/tests/accessibility/cally-clone-example.c b/tests/accessibility/cally-clone-example.c
index efb62fa9b..72d3b063d 100644
--- a/tests/accessibility/cally-clone-example.c
+++ b/tests/accessibility/cally-clone-example.c
@@ -97,7 +97,8 @@ main (int argc, char *argv[])
 
   g_set_application_name ("Clone Example");
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   cally_util_a11y_init (&argc, &argv);
 
diff --git a/tests/interactive/test-animation.c b/tests/interactive/test-animation.c
index 7a83efd60..85b7213bc 100644
--- a/tests/interactive/test-animation.c
+++ b/tests/interactive/test-animation.c
@@ -88,7 +88,8 @@ test_animation_main (int argc, char *argv[])
   ClutterColor rect_color = { 0x44, 0xdd, 0x44, 0xff };
   ClutterAction *action;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_get_default ();
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
diff --git a/tests/interactive/test-animator.c b/tests/interactive/test-animator.c
index 7ece86992..d158655de 100644
--- a/tests/interactive/test-animator.c
+++ b/tests/interactive/test-animator.c
@@ -52,7 +52,8 @@ test_animator_main (gint    argc,
   ClutterActor *stage;
   ClutterActor *rects[COUNT];
   gint i;
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_get_default ();
 
diff --git a/tests/interactive/test-behave.c b/tests/interactive/test-behave.c
index a37cd5b6e..0ec4e1e07 100644
--- a/tests/interactive/test-behave.c
+++ b/tests/interactive/test-behave.c
@@ -100,7 +100,8 @@ test_behave_main (int argc, char *argv[])
 	}
     }
   
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_new ();
   clutter_stage_set_title (CLUTTER_STAGE (stage), "Behaviours");
diff --git a/tests/interactive/test-bin-layout.c b/tests/interactive/test-bin-layout.c
index 2f68b83d4..bc461ba81 100644
--- a/tests/interactive/test-bin-layout.c
+++ b/tests/interactive/test-bin-layout.c
@@ -136,7 +136,8 @@ test_bin_layout_main (int argc, char *argv[])
   ClutterColor *color;
   ClutterAction *action;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_get_default ();
   clutter_stage_set_title (CLUTTER_STAGE (stage), "Box test");
diff --git a/tests/interactive/test-binding-pool.c b/tests/interactive/test-binding-pool.c
index b683ae85d..b73b18c90 100644
--- a/tests/interactive/test-binding-pool.c
+++ b/tests/interactive/test-binding-pool.c
@@ -247,7 +247,8 @@ test_binding_pool_main (int argc, char *argv[])
   ClutterActor *stage, *key_group;
   gint group_x, group_y;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_get_default ();
   g_signal_connect (stage,
diff --git a/tests/interactive/test-box-layout.c b/tests/interactive/test-box-layout.c
index f44544dc6..5e46b28b2 100644
--- a/tests/interactive/test-box-layout.c
+++ b/tests/interactive/test-box-layout.c
@@ -239,7 +239,8 @@ test_box_layout_main (int argc, char *argv[])
   ClutterLayoutManager *layout;
   gint i;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_get_default ();
   clutter_stage_set_title (CLUTTER_STAGE (stage), "Box Layout");
diff --git a/tests/interactive/test-cairo-flowers.c b/tests/interactive/test-cairo-flowers.c
index 540805f24..32eb650a4 100644
--- a/tests/interactive/test-cairo-flowers.c
+++ b/tests/interactive/test-cairo-flowers.c
@@ -179,7 +179,8 @@ test_cairo_flowers_main (int argc, char **argv)
 
   srand (time (NULL));
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_get_default ();
 
diff --git a/tests/interactive/test-clip.c b/tests/interactive/test-clip.c
index 95ede0212..b2f2a8af2 100644
--- a/tests/interactive/test-clip.c
+++ b/tests/interactive/test-clip.c
@@ -319,7 +319,8 @@ test_clip_main (int argc, char **argv)
   ClutterActor *stub_actor, *label;
   gchar *file;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   data.current_clip.type = CLIP_NONE;
   data.clips = NULL;
diff --git a/tests/interactive/test-cogl-multitexture.c b/tests/interactive/test-cogl-multitexture.c
index fb6cee865..1e23b0933 100644
--- a/tests/interactive/test-cogl-multitexture.c
+++ b/tests/interactive/test-cogl-multitexture.c
@@ -112,7 +112,8 @@ test_cogl_multitexture_main (int argc, char *argv[])
          0,   0,   1,   1
     };
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_get_default ();
   clutter_actor_get_geometry (stage, &geom);
diff --git a/tests/interactive/test-cogl-offscreen.c b/tests/interactive/test-cogl-offscreen.c
index 76338a757..e6a1bb7d6 100644
--- a/tests/interactive/test-cogl-offscreen.c
+++ b/tests/interactive/test-cogl-offscreen.c
@@ -298,7 +298,8 @@ test_cogl_offscreen_main (int argc, char *argv[])
   ClutterActor     *stage;
   ClutterActor     *coglbox;
 
-  clutter_init(&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   /* Stage */
   stage = clutter_stage_get_default ();
diff --git a/tests/interactive/test-cogl-point-sprites.c b/tests/interactive/test-cogl-point-sprites.c
index 67dd0668f..c457aa34c 100644
--- a/tests/interactive/test-cogl-point-sprites.c
+++ b/tests/interactive/test-cogl-point-sprites.c
@@ -226,7 +226,8 @@ test_cogl_point_sprites_main (int argc, char *argv[])
   GError *error = NULL;
   int i;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   data.material = cogl_material_new ();
   data.last_spark_time = g_timer_new ();
diff --git a/tests/interactive/test-cogl-primitives.c b/tests/interactive/test-cogl-primitives.c
index e9ecf987c..9069fc25c 100644
--- a/tests/interactive/test-cogl-primitives.c
+++ b/tests/interactive/test-cogl-primitives.c
@@ -107,7 +107,8 @@ test_cogl_primitives_main (int argc, char *argv[])
   ClutterActor *coglbox;
   ClutterTimeline *tl;
 
-  clutter_init(&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   tl = clutter_timeline_new (G_N_ELEMENTS (paint_func) * 1000);
   clutter_timeline_set_loop (tl, TRUE);
diff --git a/tests/interactive/test-cogl-shader-arbfp.c b/tests/interactive/test-cogl-shader-arbfp.c
index 7399f254f..62dbc702a 100644
--- a/tests/interactive/test-cogl-shader-arbfp.c
+++ b/tests/interactive/test-cogl-shader-arbfp.c
@@ -364,7 +364,8 @@ test_cogl_shader_arbfp_main (int argc, char *argv[])
   GError *error;
   ClutterColor stage_color = { 0x61, 0x64, 0x8c, 0xff };
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_new ();
 
diff --git a/tests/interactive/test-cogl-shader-glsl.c b/tests/interactive/test-cogl-shader-glsl.c
index 21ebe316e..0cc00e8a9 100644
--- a/tests/interactive/test-cogl-shader-glsl.c
+++ b/tests/interactive/test-cogl-shader-glsl.c
@@ -319,7 +319,8 @@ test_cogl_shader_glsl_main (int argc, char *argv[])
   GError *error;
   ClutterColor stage_color = { 0x61, 0x64, 0x8c, 0xff };
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_new ();
 
diff --git a/tests/interactive/test-cogl-tex-convert.c b/tests/interactive/test-cogl-tex-convert.c
index fe6ad79de..f1e80167a 100644
--- a/tests/interactive/test-cogl-tex-convert.c
+++ b/tests/interactive/test-cogl-tex-convert.c
@@ -198,7 +198,8 @@ test_cogl_tex_convert_main (int argc, char *argv[])
   ClutterActor     *stage;
   ClutterActor     *coglbox;
   
-  clutter_init(&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
   
   /* Stage */
   stage = clutter_stage_get_default ();
diff --git a/tests/interactive/test-cogl-tex-foreign.c b/tests/interactive/test-cogl-tex-foreign.c
index 3f059b92e..f282635ce 100644
--- a/tests/interactive/test-cogl-tex-foreign.c
+++ b/tests/interactive/test-cogl-tex-foreign.c
@@ -195,7 +195,8 @@ test_cogl_tex_foreign_main (int argc, char *argv[])
   ClutterActor     *stage;
   ClutterActor     *coglbox;
   
-  clutter_init(&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
   
   /* Stage */
   stage = clutter_stage_get_default ();
diff --git a/tests/interactive/test-cogl-tex-getset.c b/tests/interactive/test-cogl-tex-getset.c
index 20cf08167..a9d01ebf7 100644
--- a/tests/interactive/test-cogl-tex-getset.c
+++ b/tests/interactive/test-cogl-tex-getset.c
@@ -245,7 +245,8 @@ test_cogl_tex_getset_main (int argc, char *argv[])
   ClutterActor     *stage;
   ClutterActor     *coglbox;
   
-  clutter_init(&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
   
   /* Stage */
   stage = clutter_stage_get_default ();
diff --git a/tests/interactive/test-cogl-tex-polygon.c b/tests/interactive/test-cogl-tex-polygon.c
index 05c8b8bcb..00e881a66 100644
--- a/tests/interactive/test-cogl-tex-polygon.c
+++ b/tests/interactive/test-cogl-tex-polygon.c
@@ -361,7 +361,8 @@ test_cogl_tex_polygon_main (int argc, char *argv[])
   ClutterTimeline  *timeline;
   ClutterColor      blue = { 0x30, 0x30, 0xff, 0xff };
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   /* Stage */
   stage = clutter_stage_get_default ();
diff --git a/tests/interactive/test-cogl-tex-tile.c b/tests/interactive/test-cogl-tex-tile.c
index 37eb864cd..7682831dd 100644
--- a/tests/interactive/test-cogl-tex-tile.c
+++ b/tests/interactive/test-cogl-tex-tile.c
@@ -186,7 +186,8 @@ test_cogl_tex_tile_main (int argc, char *argv[])
   ClutterActor     *coglbox;
   ClutterTimeline  *timeline;
 
-  clutter_init(&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   /* Stage */
   stage = clutter_stage_get_default ();
diff --git a/tests/interactive/test-cogl-vertex-buffer.c b/tests/interactive/test-cogl-vertex-buffer.c
index c1fa1b52f..606c5bedf 100644
--- a/tests/interactive/test-cogl-vertex-buffer.c
+++ b/tests/interactive/test-cogl-vertex-buffer.c
@@ -333,7 +333,8 @@ test_cogl_vertex_buffer_main (int argc, char *argv[])
   ClutterGeometry stage_geom;
   gint            dummy_width, dummy_height;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_get_default ();
 
diff --git a/tests/interactive/test-constraints.c b/tests/interactive/test-constraints.c
index 9ebbea40d..4474784cf 100644
--- a/tests/interactive/test-constraints.c
+++ b/tests/interactive/test-constraints.c
@@ -117,7 +117,8 @@ test_constraints_main (int argc, char *argv[])
   ClutterColor rect_color;
   gint i;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_new ();
   g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);
diff --git a/tests/interactive/test-depth.c b/tests/interactive/test-depth.c
index ca386bdff..0f2ed76f1 100644
--- a/tests/interactive/test-depth.c
+++ b/tests/interactive/test-depth.c
@@ -118,7 +118,8 @@ test_depth_main (int argc, char *argv[])
   ClutterActor     *group, *hand, *label, *rect, *janus, *box;
   GError           *error;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_new ();
   clutter_stage_set_title (CLUTTER_STAGE (stage), "Depth Test");
diff --git a/tests/interactive/test-devices.c b/tests/interactive/test-devices.c
index fe060db66..1d252dc8a 100644
--- a/tests/interactive/test-devices.c
+++ b/tests/interactive/test-devices.c
@@ -221,7 +221,8 @@ test_devices_main (int argc, char **argv)
   /* force enabling X11 support */
   clutter_x11_enable_xinput ();
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   app = g_new0 (TestDevicesApp, 1);
   app->devices = g_hash_table_new (g_direct_hash, g_direct_equal) ;
diff --git a/tests/interactive/test-easing.c b/tests/interactive/test-easing.c
index 396d636fb..09b934f4f 100644
--- a/tests/interactive/test-easing.c
+++ b/tests/interactive/test-easing.c
@@ -203,12 +203,14 @@ test_easing_main (int argc, char *argv[])
   gchar *text;
   gfloat stage_width, stage_height;
   gfloat label_width, label_height;
+  GError *error = NULL;
 
-  clutter_init_with_args (&argc, &argv,
-                          NULL,
-                          test_easing_entries,
-                          NULL,
-                          NULL);
+  if (clutter_init_with_args (&argc, &argv,
+                              NULL,
+                              test_easing_entries,
+                              NULL,
+                              &error) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_get_default ();
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
diff --git a/tests/interactive/test-events.c b/tests/interactive/test-events.c
index 3781c0dcf..0213c71dc 100644
--- a/tests/interactive/test-events.c
+++ b/tests/interactive/test-events.c
@@ -268,7 +268,8 @@ test_events_main (int argc, char *argv[])
 		  ncol = { 0,    0,    0,    0xff },
                   xcol = { 0xff, 0,    0xff, 0xff };
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
 
 
diff --git a/tests/interactive/test-fbo.c b/tests/interactive/test-fbo.c
index 48df005c7..9d496f918 100644
--- a/tests/interactive/test-fbo.c
+++ b/tests/interactive/test-fbo.c
@@ -50,7 +50,8 @@ test_fbo_main (int argc, char *argv[])
   int               x_pos = 200;
   int               y_pos = 100;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   if (clutter_feature_available (CLUTTER_FEATURE_OFFSCREEN) == FALSE)
     g_error("This test requires CLUTTER_FEATURE_OFFSCREEN");
diff --git a/tests/interactive/test-fullscreen.c b/tests/interactive/test-fullscreen.c
index 7cba27952..6dbe2a2f3 100644
--- a/tests/interactive/test-fullscreen.c
+++ b/tests/interactive/test-fullscreen.c
@@ -72,7 +72,8 @@ test_fullscreen_main (int argc, char *argv[])
 {
   ClutterActor *stage;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_get_default ();
   g_signal_connect (stage,
diff --git a/tests/interactive/test-grab.c b/tests/interactive/test-grab.c
index 8dbd38c06..946cf7216 100644
--- a/tests/interactive/test-grab.c
+++ b/tests/interactive/test-grab.c
@@ -155,7 +155,8 @@ test_grab_main (int argc, char *argv[])
 		  ccol = { 0, 0xff, 0xff, 0xff },
 		  ycol = { 0xff, 0xff, 0, 0xff };
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   g_print ("Red box:    aquire grab on press, releases it on next button release\n");
   g_print ("Blue box:   aquire grab on press, destroys the blue box actor on release\n");
diff --git a/tests/interactive/test-layout.c b/tests/interactive/test-layout.c
index d941cf32a..ee8649d0e 100644
--- a/tests/interactive/test-layout.c
+++ b/tests/interactive/test-layout.c
@@ -748,7 +748,8 @@ test_layout_main (int argc, char *argv[])
   gint i, size;
   GError *error = NULL;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_get_default ();
   clutter_actor_set_size (stage, 800, 600);
diff --git a/tests/interactive/test-model.c b/tests/interactive/test-model.c
index d7b645795..f54021b77 100644
--- a/tests/interactive/test-model.c
+++ b/tests/interactive/test-model.c
@@ -211,7 +211,8 @@ test_model_main (int argc, char *argv[])
 {
   ClutterModel    *model;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   model = clutter_list_model_new (N_COLUMNS,
                                   G_TYPE_INT,    "Foo",
diff --git a/tests/interactive/test-multistage.c b/tests/interactive/test-multistage.c
index d0a87d9b4..f9130cc11 100644
--- a/tests/interactive/test-multistage.c
+++ b/tests/interactive/test-multistage.c
@@ -116,7 +116,8 @@ test_multistage_main (int argc, char *argv[])
   ClutterActor *label;
   gint width, height;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
   
   stage_default = clutter_stage_get_default ();
   clutter_stage_set_title (CLUTTER_STAGE (stage_default), "Default Stage");
diff --git a/tests/interactive/test-path-constraint.c b/tests/interactive/test-path-constraint.c
index d84a207be..bded798f7 100644
--- a/tests/interactive/test-path-constraint.c
+++ b/tests/interactive/test-path-constraint.c
@@ -102,7 +102,8 @@ test_path_constraint_main (int   argc,
   ClutterPath *path;
   ClutterColor rect_color = { 0xcc, 0x00, 0x00, 0xff };
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_new ();
   clutter_stage_set_title (CLUTTER_STAGE (stage), "Path Constraint");
diff --git a/tests/interactive/test-pixmap.c b/tests/interactive/test-pixmap.c
index 3e3ea964c..a67df4bd1 100644
--- a/tests/interactive/test-pixmap.c
+++ b/tests/interactive/test-pixmap.c
@@ -259,7 +259,8 @@ test_pixmap_main (int argc, char **argv)
   int		       i;
   int                  row_height;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   xdpy = clutter_x11_get_default_display ();
   XSynchronize (xdpy, True);
diff --git a/tests/interactive/test-scale.c b/tests/interactive/test-scale.c
index 4b101603b..af8203407 100644
--- a/tests/interactive/test-scale.c
+++ b/tests/interactive/test-scale.c
@@ -58,7 +58,8 @@ test_scale_main (int argc, char *argv[])
   ClutterAlpha    *alpha;
   ClutterBehaviour *behave;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_get_default ();
 
diff --git a/tests/interactive/test-script.c b/tests/interactive/test-script.c
index 8ebb39117..e98019697 100644
--- a/tests/interactive/test-script.c
+++ b/tests/interactive/test-script.c
@@ -140,7 +140,8 @@ test_script_main (int argc, char *argv[])
   gchar *file;
   gint res;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   script = clutter_script_new ();
   g_assert (CLUTTER_IS_SCRIPT (script));
diff --git a/tests/interactive/test-scrolling.c b/tests/interactive/test-scrolling.c
index da48ddc4a..73ba63ae2 100644
--- a/tests/interactive/test-scrolling.c
+++ b/tests/interactive/test-scrolling.c
@@ -73,7 +73,8 @@ test_scrolling_main (int argc, char *argv[])
   ClutterAction *action;
   gint i;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_new ();
   clutter_stage_set_title (CLUTTER_STAGE (stage), "Scrolling");
diff --git a/tests/interactive/test-shader-effects.c b/tests/interactive/test-shader-effects.c
index 11fba5bfb..6c7d8a618 100644
--- a/tests/interactive/test-shader-effects.c
+++ b/tests/interactive/test-shader-effects.c
@@ -14,7 +14,8 @@ test_shader_effects_main (int argc, char *argv[])
   ClutterActor *stage, *hand, *label, *rect;
   gchar *file;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   /* Make a timeline */
   timeline = clutter_timeline_new (7692);
diff --git a/tests/interactive/test-shader.c b/tests/interactive/test-shader.c
index 46c552217..4b95d5ca8 100644
--- a/tests/interactive/test-shader.c
+++ b/tests/interactive/test-shader.c
@@ -308,7 +308,8 @@ test_shader_main (gint argc, gchar *argv[])
   GError        *error;
   gchar         *file;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_new ();
   clutter_stage_set_title (CLUTTER_STAGE (stage), "Shaders");
diff --git a/tests/interactive/test-snap-constraint.c b/tests/interactive/test-snap-constraint.c
index a5cf5e75e..6ca4e3303 100644
--- a/tests/interactive/test-snap-constraint.c
+++ b/tests/interactive/test-snap-constraint.c
@@ -9,7 +9,8 @@ test_snap_constraint_main (int   argc,
 {
   ClutterActor *stage, *layer_a, *layer_b, *layer_c;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   /* the main container */
   stage = clutter_stage_new ();
diff --git a/tests/interactive/test-stage-read-pixels.c b/tests/interactive/test-stage-read-pixels.c
index 2b5ec78ee..783b22696 100644
--- a/tests/interactive/test-stage-read-pixels.c
+++ b/tests/interactive/test-stage-read-pixels.c
@@ -132,7 +132,8 @@ test_stage_read_pixels_main (int argc, char **argv)
 {
   CallbackData data;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   data.idle_source = 0;
   data.stage = clutter_stage_get_default ();
diff --git a/tests/interactive/test-stage-sizing.c b/tests/interactive/test-stage-sizing.c
index a32000db0..f4bd6867f 100644
--- a/tests/interactive/test-stage-sizing.c
+++ b/tests/interactive/test-stage-sizing.c
@@ -41,7 +41,8 @@ test_stage_sizing_main (int argc, char *argv[])
   gfloat width;
   ClutterActor *stage, *rect, *label;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_get_default ();
 
diff --git a/tests/interactive/test-state-animator.c b/tests/interactive/test-state-animator.c
index 15aeb4279..6a77d7b91 100644
--- a/tests/interactive/test-state-animator.c
+++ b/tests/interactive/test-state-animator.c
@@ -52,7 +52,8 @@ test_state_animator_main (gint    argc,
   ClutterActor *stage;
   ClutterActor *rects[40];
   gint i;
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_get_default ();
 
diff --git a/tests/interactive/test-state.c b/tests/interactive/test-state.c
index 630c4d450..650d3c452 100644
--- a/tests/interactive/test-state.c
+++ b/tests/interactive/test-state.c
@@ -96,7 +96,8 @@ test_state_main (gint    argc,
   ClutterActor *stage;
   ClutterState *layout_state;
   gint i;
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_get_default ();
   layout_state = clutter_state_new ();
diff --git a/tests/interactive/test-table-layout.c b/tests/interactive/test-table-layout.c
index c321b8c0c..c3c1877b7 100644
--- a/tests/interactive/test-table-layout.c
+++ b/tests/interactive/test-table-layout.c
@@ -168,7 +168,8 @@ test_table_layout_main (int argc, char *argv[])
   ClutterActor *box;
   gchar *file;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_get_default ();
   clutter_stage_set_title (CLUTTER_STAGE (stage), "Table Layout");
diff --git a/tests/interactive/test-text-field.c b/tests/interactive/test-text-field.c
index 948cd7b80..76e2cf4c9 100644
--- a/tests/interactive/test-text-field.c
+++ b/tests/interactive/test-text-field.c
@@ -272,7 +272,8 @@ test_text_field_main (gint    argc,
   ClutterActor *box, *entry;
   ClutterLayoutManager *table;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_new ();
   clutter_stage_set_title (CLUTTER_STAGE (stage), "Text Fields");
diff --git a/tests/interactive/test-text.c b/tests/interactive/test-text.c
index e868ebae7..a981e0dbc 100644
--- a/tests/interactive/test-text.c
+++ b/tests/interactive/test-text.c
@@ -20,7 +20,8 @@ test_text_main (gint    argc,
   ClutterColor  cursor_color     = { 0xff, 0x33, 0x33, 0xff };
   ClutterColor  background_color = { 0x00, 0x00, 0x00, 0xff };
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_get_default ();
   clutter_stage_set_color (CLUTTER_STAGE (stage), &background_color);
diff --git a/tests/interactive/test-texture-async.c b/tests/interactive/test-texture-async.c
index 9ea0a2071..f88f382a5 100644
--- a/tests/interactive/test-texture-async.c
+++ b/tests/interactive/test-texture-async.c
@@ -125,7 +125,8 @@ test_texture_async_main (int argc, char *argv[])
   ClutterColor  stage_color = { 0x12, 0x34, 0x56, 0xff };
   gchar        *path;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   g_thread_init (NULL);
   stage = clutter_stage_get_default ();
diff --git a/tests/interactive/test-texture-material.c b/tests/interactive/test-texture-material.c
index da3214c7f..867711f79 100644
--- a/tests/interactive/test-texture-material.c
+++ b/tests/interactive/test-texture-material.c
@@ -12,7 +12,8 @@ test_texture_material_main (int argc, char *argv[])
 
   g_thread_init (NULL);
   clutter_threads_init ();
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_new ();
   clutter_stage_set_title (CLUTTER_STAGE (stage), "Texture Material");
diff --git a/tests/interactive/test-texture-quality.c b/tests/interactive/test-texture-quality.c
index 18d5c20c1..eb0463036 100644
--- a/tests/interactive/test-texture-quality.c
+++ b/tests/interactive/test-texture-quality.c
@@ -54,7 +54,8 @@ test_texture_quality_main (int argc, char *argv[])
   GError           *error;
   gchar            *file;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_get_default ();
   clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
diff --git a/tests/interactive/test-textures.c b/tests/interactive/test-textures.c
index fba4736bd..d8094e947 100644
--- a/tests/interactive/test-textures.c
+++ b/tests/interactive/test-textures.c
@@ -57,7 +57,8 @@ test_textures_main (int argc, char *argv[])
   ClutterActor    *stage;
   gint             i, j;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_get_default ();
   clutter_actor_show_all (CLUTTER_ACTOR (stage));
diff --git a/tests/interactive/test-threads.c b/tests/interactive/test-threads.c
index 18175bb3e..dd7a2f85f 100644
--- a/tests/interactive/test-threads.c
+++ b/tests/interactive/test-threads.c
@@ -190,7 +190,8 @@ test_threads_main (int argc, char *argv[])
 
   g_thread_init (NULL);
   clutter_threads_init ();
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_new ();
   clutter_stage_set_title (CLUTTER_STAGE (stage), "Threading");
diff --git a/tests/interactive/test-unproject.c b/tests/interactive/test-unproject.c
index 6c1e857e2..5b5f481f9 100644
--- a/tests/interactive/test-unproject.c
+++ b/tests/interactive/test-unproject.c
@@ -101,7 +101,8 @@ test_unproject_main (int argc, char *argv[])
 	}
     }
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_get_default ();
 
diff --git a/tests/micro-bench/test-picking.c b/tests/micro-bench/test-picking.c
index 8e2c00cbb..f66172905 100644
--- a/tests/micro-bench/test-picking.c
+++ b/tests/micro-bench/test-picking.c
@@ -75,16 +75,18 @@ main (int argc, char **argv)
   const ClutterColor black = { 0x00, 0x00, 0x00, 0xff };
   ClutterColor color = { 0x00, 0x00, 0x00, 0xff };
   ClutterActor *stage, *rect;
+  GError *error = NULL;
 
   g_setenv ("CLUTTER_VBLANK", "none", FALSE);
   g_setenv ("CLUTTER_DEFAULT_FPS", "1000", FALSE);
   g_setenv ("CLUTTER_SHOW_FPS", "1", FALSE);
 
-  clutter_init_with_args (&argc, &argv,
-                          NULL,
-                          entries,
-                          NULL,
-                          NULL);
+  if (clutter_init_with_args (&argc, &argv,
+                              NULL,
+                              entries,
+                              NULL,
+                              &error) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_get_default ();
   clutter_actor_set_size (stage, 512, 512);
diff --git a/tests/micro-bench/test-random-text.c b/tests/micro-bench/test-random-text.c
index 656448b79..b1f710d89 100644
--- a/tests/micro-bench/test-random-text.c
+++ b/tests/micro-bench/test-random-text.c
@@ -87,7 +87,8 @@ main (int argc, char *argv[])
 {
   ClutterActor *stage;
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_get_default ();
 
diff --git a/tests/micro-bench/test-text-perf.c b/tests/micro-bench/test-text-perf.c
index b10c569e4..e21939caf 100644
--- a/tests/micro-bench/test-text-perf.c
+++ b/tests/micro-bench/test-text-perf.c
@@ -114,7 +114,8 @@ main (int argc, char *argv[])
   g_setenv ("CLUTTER_VBLANK", "none", FALSE);
   g_setenv ("CLUTTER_DEFAULT_FPS", "1000", FALSE);
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   if (argc != 3)
     {
diff --git a/tests/micro-bench/test-text.c b/tests/micro-bench/test-text.c
index da86b2b3b..93a8f5596 100644
--- a/tests/micro-bench/test-text.c
+++ b/tests/micro-bench/test-text.c
@@ -50,7 +50,8 @@ main (int argc, char *argv[])
   g_setenv ("CLUTTER_VBLANK", "none", FALSE);
   g_setenv ("CLUTTER_DEFAULT_FPS", "1000", FALSE);
 
-  clutter_init (&argc, &argv);
+  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+    return 1;
 
   stage = clutter_stage_get_default ();
   clutter_actor_set_size (stage, STAGE_WIDTH, STAGE_HEIGHT);