7e8eab0f44dcca858500627fe2c4e5c2ee8fb218
diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am
index d610366..ef5e270 100644
--- a/tests/gobject/Makefile.am
+++ b/tests/gobject/Makefile.am
@@ -47,9 +47,13 @@ CLEANFILES = stamp-testmarshal.h
 
 LDADD = libtestgobject.la $(libgobject) 
 
+noinst_PROGRAMS = $(TEST_PROGS)
+
+TEST_PROGS          += gvalue-test
+gvalue_test_SOURCES  = gvalue-test.c
+
 test_programs =					\
 	deftype					\
-	gvalue-test				\
 	paramspec-test				\
 	accumulator				\
 	defaultiface				\
diff --git a/tests/gobject/gvalue-test.c b/tests/gobject/gvalue-test.c
index 2d721e0..f8d4986 100644
--- a/tests/gobject/gvalue-test.c
+++ b/tests/gobject/gvalue-test.c
@@ -21,7 +21,7 @@
  * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GLib Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/. 
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
 #undef G_DISABLE_ASSERT
@@ -34,62 +34,64 @@
 #include "gobject/gvaluecollector.h"
 
 static void
-test_enum_transformation (void)
-{ 
-  GType type; 
+test_enum_transformation (void         *unused,
+                          gconstpointer test_data)
+{
+  GType type;
   GValue orig = { 0, };
-  GValue xform = { 0, }; 
-  GEnumValue values[] = { {0,"0","0"}, {1,"1","1"}}; 
-  
- type = g_enum_register_static ("TestEnum", values); 
-  
- g_value_init (&orig, type); 
- g_value_set_enum (&orig, 1); 
-
- memset (&xform, 0, sizeof (GValue));
- g_value_init (&xform, G_TYPE_CHAR); 
- g_value_transform (&orig, &xform); 
- g_assert (g_value_get_char (&xform) == 1);
-
- memset (&xform, 0, sizeof (GValue));
- g_value_init (&xform, G_TYPE_UCHAR); 
- g_value_transform (&orig, &xform); 
- g_assert (g_value_get_uchar (&xform) == 1);
-
- memset (&xform, 0, sizeof (GValue));
- g_value_init (&xform, G_TYPE_INT); 
- g_value_transform (&orig, &xform); 
- g_assert (g_value_get_int (&xform) == 1);
-
- memset (&xform, 0, sizeof (GValue));
- g_value_init (&xform, G_TYPE_UINT); 
- g_value_transform (&orig, &xform); 
- g_assert (g_value_get_uint (&xform) == 1);
-
- memset (&xform, 0, sizeof (GValue));
- g_value_init (&xform, G_TYPE_LONG); 
- g_value_transform (&orig, &xform); 
- g_assert (g_value_get_long (&xform) == 1);
-
- memset (&xform, 0, sizeof (GValue));
- g_value_init (&xform, G_TYPE_ULONG); 
- g_value_transform (&orig, &xform); 
- g_assert (g_value_get_ulong (&xform) == 1);
-
- memset (&xform, 0, sizeof (GValue));
- g_value_init (&xform, G_TYPE_INT64); 
- g_value_transform (&orig, &xform); 
- g_assert (g_value_get_int64 (&xform) == 1);
-
- memset (&xform, 0, sizeof (GValue));
- g_value_init (&xform, G_TYPE_UINT64); 
- g_value_transform (&orig, &xform); 
- g_assert (g_value_get_uint64 (&xform) == 1);
+  GValue xform = { 0, };
+  GEnumValue values[] = { {0,"0","0"}, {1,"1","1"}};
+
+  type = g_enum_register_static ("TestEnum", values);
+
+  g_value_init (&orig, type);
+  g_value_set_enum (&orig, 1);
+
+  memset (&xform, 0, sizeof (GValue));
+  g_value_init (&xform, G_TYPE_CHAR);
+  g_value_transform (&orig, &xform);
+  g_assert_cmpint (g_value_get_char (&xform), ==, 1);
+
+  memset (&xform, 0, sizeof (GValue));
+  g_value_init (&xform, G_TYPE_UCHAR);
+  g_value_transform (&orig, &xform);
+  g_assert_cmpint (g_value_get_uchar (&xform), ==, 1);
+
+  memset (&xform, 0, sizeof (GValue));
+  g_value_init (&xform, G_TYPE_INT);
+  g_value_transform (&orig, &xform);
+  g_assert_cmpint (g_value_get_int (&xform), ==, 1);
+
+  memset (&xform, 0, sizeof (GValue));
+  g_value_init (&xform, G_TYPE_UINT);
+  g_value_transform (&orig, &xform);
+  g_assert_cmpint (g_value_get_uint (&xform), ==, 1);
+
+  memset (&xform, 0, sizeof (GValue));
+  g_value_init (&xform, G_TYPE_LONG);
+  g_value_transform (&orig, &xform);
+  g_assert_cmpint (g_value_get_long (&xform), ==, 1);
+
+  memset (&xform, 0, sizeof (GValue));
+  g_value_init (&xform, G_TYPE_ULONG);
+  g_value_transform (&orig, &xform);
+  g_assert_cmpint (g_value_get_ulong (&xform), ==, 1);
+
+  memset (&xform, 0, sizeof (GValue));
+  g_value_init (&xform, G_TYPE_INT64);
+  g_value_transform (&orig, &xform);
+  g_assert_cmpint (g_value_get_int64 (&xform), ==, 1);
+
+  memset (&xform, 0, sizeof (GValue));
+  g_value_init (&xform, G_TYPE_UINT64);
+  g_value_transform (&orig, &xform);
+  g_assert_cmpint (g_value_get_uint64 (&xform), ==, 1);
 }
 
 
 static void
-test_gtype_value (void)
+test_gtype_value (void         *unused,
+                  gconstpointer test_data)
 {
   GType type;
   GValue value = { 0, };
@@ -99,12 +101,12 @@ test_gtype_value (void)
 
   g_value_set_gtype (&value, G_TYPE_BOXED);
   type = g_value_get_gtype (&value);
-  g_assert (type == G_TYPE_BOXED);
+  g_assert_cmpint (type, ==, G_TYPE_BOXED);
 
   g_value_init (&copy, G_TYPE_GTYPE);
   g_value_copy (&value, &copy);
   type = g_value_get_gtype (&copy);
-  g_assert (type == G_TYPE_BOXED);
+  g_assert_cmpint (type, ==, G_TYPE_BOXED);
 }
 
 static gchar *
@@ -120,7 +122,7 @@ collect (GValue *value, ...)
   va_end (var_args);
 
   return error;
-}	 
+}
 
 static gchar *
 lcopy (GValue *value, ...)
@@ -135,94 +137,96 @@ lcopy (GValue *value, ...)
   va_end (var_args);
 
   return error;
-}	 
+}
 
 static void
-test_collection (void)
+test_collection (void         *unused,
+                 gconstpointer test_data)
 {
   GValue value = { 0, };
   gchar *error;
-  
+
   g_value_init (&value, G_TYPE_CHAR);
   error = collect (&value, 'c');
   g_assert (error == NULL);
-  g_assert (g_value_get_char (&value) == 'c');
-  
+  g_assert_cmpint (g_value_get_char (&value), ==, 'c');
+
   g_value_unset (&value);
   g_value_init (&value, G_TYPE_UCHAR);
   error = collect (&value, 129);
   g_assert (error == NULL);
-  g_assert (g_value_get_uchar (&value) == 129);
-  
+  g_assert_cmpint (g_value_get_uchar (&value), ==, 129);
+
   g_value_unset (&value);
   g_value_init (&value, G_TYPE_BOOLEAN);
   error = collect (&value, TRUE);
   g_assert (error == NULL);
-  g_assert (g_value_get_boolean (&value) == TRUE);
-  
+  g_assert_cmpint (g_value_get_boolean (&value), ==, TRUE);
+
   g_value_unset (&value);
   g_value_init (&value, G_TYPE_INT);
   error = collect (&value, G_MAXINT);
   g_assert (error == NULL);
-  g_assert (g_value_get_int (&value) == G_MAXINT);
-  
+  g_assert_cmpint (g_value_get_int (&value), ==, G_MAXINT);
+
   g_value_unset (&value);
   g_value_init (&value, G_TYPE_UINT);
   error = collect (&value, G_MAXUINT);
   g_assert (error == NULL);
-  g_assert (g_value_get_uint (&value) == G_MAXUINT);
-  
-  g_value_unset (&value);  
+  g_assert_cmpint (g_value_get_uint (&value), ==, G_MAXUINT);
+
+  g_value_unset (&value);
   g_value_init (&value, G_TYPE_LONG);
   error = collect (&value, G_MAXLONG);
   g_assert (error == NULL);
-  g_assert (g_value_get_long (&value) == G_MAXLONG);
-  
+  g_assert_cmpint (g_value_get_long (&value), ==, G_MAXLONG);
+
   g_value_unset (&value);
   g_value_init (&value, G_TYPE_ULONG);
   error = collect (&value, G_MAXULONG);
   g_assert (error == NULL);
-  g_assert (g_value_get_ulong (&value) == G_MAXULONG);
-  
-  g_value_unset (&value);  
+  g_assert_cmpint (g_value_get_ulong (&value), ==, G_MAXULONG);
+
+  g_value_unset (&value);
   g_value_init (&value, G_TYPE_INT64);
   error = collect (&value, G_MAXINT64);
   g_assert (error == NULL);
-  g_assert (g_value_get_int64 (&value) == G_MAXINT64);
-  
+  g_assert_cmpint (g_value_get_int64 (&value), ==, G_MAXINT64);
+
   g_value_unset (&value);
   g_value_init (&value, G_TYPE_UINT64);
   error = collect (&value, G_MAXUINT64);
   g_assert (error == NULL);
-  g_assert (g_value_get_uint64 (&value) == G_MAXUINT64);
-  
+  g_assert_cmpint (g_value_get_uint64 (&value), ==, G_MAXUINT64);
+
   g_value_unset (&value);
   g_value_init (&value, G_TYPE_FLOAT);
   error = collect (&value, G_MAXFLOAT);
   g_assert (error == NULL);
-  g_assert (g_value_get_float (&value) == G_MAXFLOAT);
-  
+  g_assert_cmpfloat (g_value_get_float (&value), ==, G_MAXFLOAT);
+
   g_value_unset (&value);
   g_value_init (&value, G_TYPE_DOUBLE);
   error = collect (&value, G_MAXDOUBLE);
   g_assert (error == NULL);
-  g_assert (g_value_get_double (&value) == G_MAXDOUBLE);
-  
+  g_assert_cmpfloat (g_value_get_double (&value), ==, G_MAXDOUBLE);
+
   g_value_unset (&value);
   g_value_init (&value, G_TYPE_STRING);
   error = collect (&value, "string ?");
   g_assert (error == NULL);
-  g_assert (strcmp (g_value_get_string (&value), "string ?") == 0);
-  
+  g_assert_cmpstr (g_value_get_string (&value), ==, "string ?");
+
   g_value_unset (&value);
   g_value_init (&value, G_TYPE_GTYPE);
   error = collect (&value, G_TYPE_BOXED);
   g_assert (error == NULL);
-  g_assert (g_value_get_gtype (&value) == G_TYPE_BOXED);
+  g_assert_cmpint (g_value_get_gtype (&value), ==, G_TYPE_BOXED);
 }
 
 static void
-test_copying (void)
+test_copying (void         *unused,
+              gconstpointer test_data)
 {
   GValue value = { 0, };
   gchar *error;
@@ -234,8 +238,8 @@ test_copying (void)
     g_value_set_char (&value, 'c');
     error = lcopy (&value, &c);
     g_assert (error == NULL);
-    g_assert (c == 'c');
-  }  
+    g_assert_cmpint (c, ==, 'c');
+  }
 
   {
     guchar c = 0;
@@ -245,8 +249,8 @@ test_copying (void)
     g_value_set_uchar (&value, 129);
     error = lcopy (&value, &c);
     g_assert (error == NULL);
-    g_assert (c == 129);
-  }  
+    g_assert_cmpint (c, ==, 129);
+  }
 
   {
     gint c = 0;
@@ -256,8 +260,8 @@ test_copying (void)
     g_value_set_int (&value, G_MAXINT);
     error = lcopy (&value, &c);
     g_assert (error == NULL);
-    g_assert (c == G_MAXINT);
-  }  
+    g_assert_cmpint (c, ==, G_MAXINT);
+  }
 
   {
     guint c = 0;
@@ -267,8 +271,8 @@ test_copying (void)
     g_value_set_uint (&value, G_MAXUINT);
     error = lcopy (&value, &c);
     g_assert (error == NULL);
-    g_assert (c == G_MAXUINT);
-  }  
+    g_assert_cmpint (c, ==, G_MAXUINT);
+  }
 
   {
     glong c = 0;
@@ -278,8 +282,8 @@ test_copying (void)
     g_value_set_long (&value, G_MAXLONG);
     error = lcopy (&value, &c);
     g_assert (error == NULL);
-    g_assert (c == G_MAXLONG);
-  }  
+    g_assert_cmpint (c, ==, G_MAXLONG);
+  }
 
   {
     gulong c = 0;
@@ -289,8 +293,8 @@ test_copying (void)
     g_value_set_ulong (&value, G_MAXULONG);
     error = lcopy (&value, &c);
     g_assert (error == NULL);
-    g_assert (c == G_MAXULONG);
-  }  
+    g_assert_cmpint (c, ==, G_MAXULONG);
+  }
 
   {
     gint64 c = 0;
@@ -300,8 +304,8 @@ test_copying (void)
     g_value_set_int64 (&value, G_MAXINT64);
     error = lcopy (&value, &c);
     g_assert (error == NULL);
-    g_assert (c == G_MAXINT64);
-  }  
+    g_assert_cmpint (c, ==, G_MAXINT64);
+  }
 
   {
     guint64 c = 0;
@@ -311,8 +315,8 @@ test_copying (void)
     g_value_set_uint64 (&value, G_MAXUINT64);
     error = lcopy (&value, &c);
     g_assert (error == NULL);
-    g_assert (c == G_MAXUINT64);
-  }  
+    g_assert_cmpint (c, ==, G_MAXUINT64);
+  }
 
   {
     gfloat c = 0;
@@ -322,8 +326,8 @@ test_copying (void)
     g_value_set_float (&value, G_MAXFLOAT);
     error = lcopy (&value, &c);
     g_assert (error == NULL);
-    g_assert (c == G_MAXFLOAT);
-  }  
+    g_assert_cmpfloat (c, ==, G_MAXFLOAT);
+  }
 
   {
     gdouble c = 0;
@@ -333,8 +337,8 @@ test_copying (void)
     g_value_set_double (&value, G_MAXDOUBLE);
     error = lcopy (&value, &c);
     g_assert (error == NULL);
-    g_assert (c == G_MAXDOUBLE);
-  }  
+    g_assert_cmpfloat (c, ==, G_MAXDOUBLE);
+  }
 
   {
     gchar *c = NULL;
@@ -344,8 +348,8 @@ test_copying (void)
     g_value_set_string (&value, "string ?");
     error = lcopy (&value, &c);
     g_assert (error == NULL);
-    g_assert (strcmp (c, "string ?") == 0);
-  }  
+    g_assert_cmpstr (c, ==, "string ?");
+  }
 
   {
     GType c = G_TYPE_NONE;
@@ -355,20 +359,23 @@ test_copying (void)
     g_value_set_gtype (&value, G_TYPE_BOXED);
     error = lcopy (&value, &c);
     g_assert (error == NULL);
-    g_assert (c == G_TYPE_BOXED);
-  }  
+    g_assert_cmpint (c, ==, G_TYPE_BOXED);
+  }
 }
 
 
 int
-main (int argc, char *argv[])
+main (int   argc,
+      char *argv[])
 {
-  g_type_init (); 
-  
-  test_enum_transformation ();
-  test_gtype_value ();
-  test_collection ();
-  test_copying ();
-
-  return 0;
+  g_type_init ();
+
+  g_test_init (&argc, &argv, NULL);
+
+  g_test_add ("/gvalue/enum-transformation", void, NULL, NULL, test_enum_transformation, NULL);
+  g_test_add ("/gvalue/gtype-value", void, NULL, NULL, test_gtype_value, NULL);
+  g_test_add ("/gvalue/collection", void, NULL, NULL, test_collection, NULL);
+  g_test_add ("/gvalue/copying", void, NULL, NULL, test_copying, NULL);
+
+  return g_test_run ();
 }
