split up tests and reworked code to use the new test framework.

2007-12-12 16:06:11  Tim Janik  <timj@imendio.com>

        * tests/testglib.c: split up tests and reworked code to use
        the new test framework.

        * tests/Makefile.am: added testglib to TEST_PROGS.



svn path=/trunk/; revision=6103

2 files changed, 895 insertions, 891 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7454e6a0f..b4da4df0c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -66,7 +66,6 @@ if ENABLE_TIMELOOP
 timeloop = timeloop timeloop-closure
 endif
 noinst_PROGRAMS = $(TEST_PROGS)	\
-	testglib		\
 	testgdate 		\
 	testgdateparser 	\
 	unicode-normalize 	\
@@ -77,9 +76,10 @@ noinst_PROGRAMS = $(TEST_PROGS)	\
 TEST_PROGS              += scannerapi
 scannerapi_SOURCES       = scannerapi.c
 scannerapi_LDADD         = $(progs_ldadd)
+TEST_PROGS		+= testglib
+testglib_LDADD		 = $(libglib)
 
 
-testglib_LDADD = $(libglib)
 patterntest_LDADD = $(libglib)
 testgdate_LDADD = $(libglib)
 testgdateparser_LDADD = $(libglib)
diff --git a/tests/testglib.c b/tests/testglib.c
index 9105321fb..9838dc863 100644
--- a/tests/testglib.c
+++ b/tests/testglib.c
@@ -26,12 +26,7 @@
 
 #include "config.h"
 
-#undef G_DISABLE_ASSERT
-#undef G_LOG_DOMAIN
-
-#ifdef GLIB_COMPILATION
 #undef GLIB_COMPILATION
-#endif
 
 #include <stdio.h>
 #include <string.h>
@@ -40,6 +35,8 @@
 #include "glib.h"
 #include "gstdio.h"
 
+#include <stdlib.h>
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -48,28 +45,195 @@
 #include <io.h>			/* For read(), write() etc */
 #endif
 
-static int array[10000];
-static gboolean failed = FALSE;
-
-/* We write (m ? m : "") even in the m != NULL case to suppress a warning with GCC-3.1
- */
-#define	TEST(m,cond)	G_STMT_START { failed = !(cond); \
-if (failed) \
-  { if (!m) \
-      g_print ("\n(%s:%d) failed for: %s\n", __FILE__, __LINE__, ( # cond )); \
-    else \
-      g_print ("\n(%s:%d) failed for: %s: (%s)\n", __FILE__, __LINE__, ( # cond ), (gchar*)(m ? m : "")); \
-  } \
-else \
-  g_print ("."); fflush (stdout); \
-} G_STMT_END
-
-#define	C2P(c)		((gpointer) ((long) (c)))
-#define	P2C(p)		((gchar) ((long) (p)))
 
 #define GLIB_TEST_STRING "el dorado "
 #define GLIB_TEST_STRING_5 "el do"
 
+
+/* --- variables --- */
+static gint test_nums[10] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+static gint more_nums[10] = { 8, 9, 7, 0, 3, 2, 5, 1, 4, 6};
+
+/* --- functions --- */
+static gint
+my_list_compare_one (gconstpointer a, gconstpointer b)
+{
+  gint one = *((const gint*)a);
+  gint two = *((const gint*)b);
+  return one-two;
+}
+
+static gint
+my_list_compare_two (gconstpointer a, gconstpointer b)
+{
+  gint one = *((const gint*)a);
+  gint two = *((const gint*)b);
+  return two-one;
+}
+
+/* static void
+my_list_print (gpointer a, gpointer b)
+{
+  gint three = *((gint*)a);
+  g_print("%d", three);
+}; */
+
+static void
+glist_test (void)
+{
+  GList *list = NULL;
+  guint i;
+
+  for (i = 0; i < 10; i++)
+    list = g_list_append (list, &test_nums[i]);
+  list = g_list_reverse (list);
+
+  for (i = 0; i < 10; i++)
+    {
+      GList *t = g_list_nth (list, i);
+      if (*((gint*) t->data) != (9 - i))
+	g_error ("Regular insert failed");
+    }
+
+  for (i = 0; i < 10; i++)
+    if (g_list_position (list, g_list_nth (list, i)) != i)
+      g_error ("g_list_position does not seem to be the inverse of g_list_nth\n");
+
+  g_list_free (list);
+  list = NULL;
+
+  for (i = 0; i < 10; i++)
+    list = g_list_insert_sorted (list, &more_nums[i], my_list_compare_one);
+
+  /*
+  g_print("\n");
+  g_list_foreach (list, my_list_print, NULL);
+  */
+
+  for (i = 0; i < 10; i++)
+    {
+      GList *t = g_list_nth (list, i);
+      if (*((gint*) t->data) != i)
+         g_error ("Sorted insert failed");
+    }
+
+  g_list_free (list);
+  list = NULL;
+
+  for (i = 0; i < 10; i++)
+    list = g_list_insert_sorted (list, &more_nums[i], my_list_compare_two);
+
+  /*
+  g_print("\n");
+  g_list_foreach (list, my_list_print, NULL);
+  */
+
+  for (i = 0; i < 10; i++)
+    {
+      GList *t = g_list_nth (list, i);
+      if (*((gint*) t->data) != (9 - i))
+         g_error ("Sorted insert failed");
+    }
+
+  g_list_free (list);
+  list = NULL;
+
+  for (i = 0; i < 10; i++)
+    list = g_list_prepend (list, &more_nums[i]);
+
+  list = g_list_sort (list, my_list_compare_two);
+
+  /*
+  g_print("\n");
+  g_list_foreach (list, my_list_print, NULL);
+  */
+
+  for (i = 0; i < 10; i++)
+    {
+      GList *t = g_list_nth (list, i);
+      if (*((gint*) t->data) != (9 - i))
+         g_error ("Merge sort failed");
+    }
+
+  g_list_free (list);
+}
+
+static void
+gslist_test (void)
+{
+  GSList *slist = NULL;
+  guint i;
+
+  for (i = 0; i < 10; i++)
+    slist = g_slist_append (slist, &test_nums[i]);
+  slist = g_slist_reverse (slist);
+
+  for (i = 0; i < 10; i++)
+    {
+      GSList *st = g_slist_nth (slist, i);
+      if (*((gint*) st->data) != (9 - i))
+	g_error ("failed");
+    }
+
+  g_slist_free (slist);
+  slist = NULL;
+
+  for (i = 0; i < 10; i++)
+    slist = g_slist_insert_sorted (slist, &more_nums[i], my_list_compare_one);
+
+  /*
+  g_print("\n");
+  g_slist_foreach (slist, my_list_print, NULL);
+  */
+
+  for (i = 0; i < 10; i++)
+    {
+      GSList *st = g_slist_nth (slist, i);
+      if (*((gint*) st->data) != i)
+        g_error ("Sorted insert failed");
+    }
+
+  g_slist_free (slist);
+  slist = NULL;
+
+  for (i = 0; i < 10; i++)
+    slist = g_slist_insert_sorted (slist, &more_nums[i], my_list_compare_two);
+
+  /*
+  g_print("\n");
+  g_slist_foreach (slist, my_list_print, NULL);
+  */
+
+  for (i = 0; i < 10; i++)
+    {
+      GSList *st = g_slist_nth (slist, i);
+      if (*((gint*) st->data) != (9 - i))
+        g_error("Sorted insert failed");
+    }
+
+  g_slist_free(slist);
+  slist = NULL;
+
+  for (i = 0; i < 10; i++)
+    slist = g_slist_prepend (slist, &more_nums[i]);
+
+  slist = g_slist_sort (slist, my_list_compare_two);
+
+  /*
+  g_print("\n");
+  g_slist_foreach (slist, my_list_print, NULL);
+  */
+
+  for (i = 0; i < 10; i++)
+    {
+      GSList *st = g_slist_nth (slist, i);
+      if (*((gint*) st->data) != (9 - i))
+        g_error("Sorted insert failed");
+    }
+
+  g_slist_free(slist);
+}
+
 static gboolean
 node_build_string (GNode    *node,
 		   gpointer  data)
@@ -78,7 +242,7 @@ node_build_string (GNode    *node,
   gchar *string;
   gchar c[2] = "_";
 
-  c[0] = P2C (node->data);
+  c[0] = ((gchar) ((long) (node->data)));
 
   string = g_strconcat (*p ? *p : "", c, NULL);
   g_free (*p);
@@ -88,8 +252,10 @@ node_build_string (GNode    *node,
 }
 
 static void
-g_node_test (void)
+gnode_test (void)
 {
+#define	C2P(c)		((gpointer) ((long) (c)))
+#define	P2C(p)		((gchar) ((long) (p)))
   GNode *root;
   GNode *node;
   GNode *node_B;
@@ -99,15 +265,12 @@ g_node_test (void)
   guint i;
   gchar *tstring, *cstring;
 
-  g_print ("checking n-way trees: ");
-  failed = FALSE;
-
   root = g_node_new (C2P ('A'));
-  TEST (NULL, g_node_depth (root) == 1 && g_node_max_height (root) == 1);
+  g_assert (g_node_depth (root) == 1 && g_node_max_height (root) == 1);
 
   node_B = g_node_new (C2P ('B'));
   g_node_append (root, node_B);
-  TEST (NULL, root->children == node_B);
+  g_assert (root->children == node_B);
 
   g_node_append_data (node_B, C2P ('E'));
   g_node_prepend_data (node_B, C2P ('C'));
@@ -115,7 +278,7 @@ g_node_test (void)
 
   node_F = g_node_new (C2P ('F'));
   g_node_append (root, node_F);
-  TEST (NULL, root->children->next == node_F);
+  g_assert (root->children->next == node_F);
 
   node_G = g_node_new (C2P ('G'));
   g_node_append (node_F, node_G);
@@ -125,26 +288,26 @@ g_node_test (void)
   g_node_insert_data (node_G, 0, C2P ('H'));
   g_node_insert (node_G, 1, g_node_new (C2P ('I')));
 
-  TEST (NULL, g_node_depth (root) == 1);
-  TEST (NULL, g_node_max_height (root) == 4);
-  TEST (NULL, g_node_depth (node_G->children->next) == 4);
-  TEST (NULL, g_node_n_nodes (root, G_TRAVERSE_LEAFS) == 7);
-  TEST (NULL, g_node_n_nodes (root, G_TRAVERSE_NON_LEAFS) == 4);
-  TEST (NULL, g_node_n_nodes (root, G_TRAVERSE_ALL) == 11);
-  TEST (NULL, g_node_max_height (node_F) == 3);
-  TEST (NULL, g_node_n_children (node_G) == 4);
-  TEST (NULL, g_node_find_child (root, G_TRAVERSE_ALL, C2P ('F')) == node_F);
-  TEST (NULL, g_node_find (root, G_LEVEL_ORDER, G_TRAVERSE_NON_LEAFS, C2P ('I')) == NULL);
-  TEST (NULL, g_node_find (root, G_IN_ORDER, G_TRAVERSE_LEAFS, C2P ('J')) == node_J);
+  g_assert (g_node_depth (root) == 1);
+  g_assert (g_node_max_height (root) == 4);
+  g_assert (g_node_depth (node_G->children->next) == 4);
+  g_assert (g_node_n_nodes (root, G_TRAVERSE_LEAFS) == 7);
+  g_assert (g_node_n_nodes (root, G_TRAVERSE_NON_LEAFS) == 4);
+  g_assert (g_node_n_nodes (root, G_TRAVERSE_ALL) == 11);
+  g_assert (g_node_max_height (node_F) == 3);
+  g_assert (g_node_n_children (node_G) == 4);
+  g_assert (g_node_find_child (root, G_TRAVERSE_ALL, C2P ('F')) == node_F);
+  g_assert (g_node_find (root, G_LEVEL_ORDER, G_TRAVERSE_NON_LEAFS, C2P ('I')) == NULL);
+  g_assert (g_node_find (root, G_IN_ORDER, G_TRAVERSE_LEAFS, C2P ('J')) == node_J);
 
   for (i = 0; i < g_node_n_children (node_B); i++)
     {
       node = g_node_nth_child (node_B, i);
-      TEST (NULL, P2C (node->data) == ('C' + i));
+      g_assert (P2C (node->data) == ('C' + i));
     }
   
   for (i = 0; i < g_node_n_children (node_G); i++)
-    TEST (NULL, g_node_child_position (node_G, g_node_nth_child (node_G, i)) == i);
+    g_assert (g_node_child_position (node_G, g_node_nth_child (node_G, i)) == i);
 
   /* we have built:                    A
    *                                 /   \
@@ -160,39 +323,39 @@ g_node_test (void)
 
   tstring = NULL;
   g_node_traverse (root, G_PRE_ORDER, G_TRAVERSE_ALL, -1, node_build_string, &tstring);
-  TEST (tstring, strcmp (tstring, "ABCDEFGHIJK") == 0);
+  g_assert_cmpstr (tstring, ==, "ABCDEFGHIJK");
   g_free (tstring); tstring = NULL;
   g_node_traverse (root, G_POST_ORDER, G_TRAVERSE_ALL, -1, node_build_string, &tstring);
-  TEST (tstring, strcmp (tstring, "CDEBHIJKGFA") == 0);
+  g_assert_cmpstr (tstring, ==, "CDEBHIJKGFA");
   g_free (tstring); tstring = NULL;
   g_node_traverse (root, G_IN_ORDER, G_TRAVERSE_ALL, -1, node_build_string, &tstring);
-  TEST (tstring, strcmp (tstring, "CBDEAHGIJKF") == 0);
+  g_assert_cmpstr (tstring, ==, "CBDEAHGIJKF");
   g_free (tstring); tstring = NULL;
   g_node_traverse (root, G_LEVEL_ORDER, G_TRAVERSE_ALL, -1, node_build_string, &tstring);
-  TEST (tstring, strcmp (tstring, "ABFCDEGHIJK") == 0);
+  g_assert_cmpstr (tstring, ==, "ABFCDEGHIJK");
   g_free (tstring); tstring = NULL;
   
   g_node_traverse (root, G_LEVEL_ORDER, G_TRAVERSE_LEAFS, -1, node_build_string, &tstring);
-  TEST (tstring, strcmp (tstring, "CDEHIJK") == 0);
+  g_assert_cmpstr (tstring, ==, "CDEHIJK");
   g_free (tstring); tstring = NULL;
   g_node_traverse (root, G_PRE_ORDER, G_TRAVERSE_NON_LEAFS, -1, node_build_string, &tstring);
-  TEST (tstring, strcmp (tstring, "ABFG") == 0);
+  g_assert_cmpstr (tstring, ==, "ABFG");
   g_free (tstring); tstring = NULL;
 
   g_node_reverse_children (node_B);
   g_node_reverse_children (node_G);
 
   g_node_traverse (root, G_LEVEL_ORDER, G_TRAVERSE_ALL, -1, node_build_string, &tstring);
-  TEST (tstring, strcmp (tstring, "ABFEDCGKJIH") == 0);
+  g_assert_cmpstr (tstring, ==, "ABFEDCGKJIH");
   g_free (tstring); tstring = NULL;
 
   cstring = NULL;
   node = g_node_copy (root);
-  TEST (NULL, g_node_n_nodes (root, G_TRAVERSE_ALL) == g_node_n_nodes (node, G_TRAVERSE_ALL));
-  TEST (NULL, g_node_max_height (root) == g_node_max_height (node));
+  g_assert (g_node_n_nodes (root, G_TRAVERSE_ALL) == g_node_n_nodes (node, G_TRAVERSE_ALL));
+  g_assert (g_node_max_height (root) == g_node_max_height (node));
   g_node_traverse (root, G_IN_ORDER, G_TRAVERSE_ALL, -1, node_build_string, &tstring);
   g_node_traverse (node, G_IN_ORDER, G_TRAVERSE_ALL, -1, node_build_string, &cstring);
-  TEST (cstring, strcmp (tstring, cstring) == 0);
+  g_assert_cmpstr (tstring, ==, cstring);
   g_free (tstring); tstring = NULL;
   g_free (cstring); cstring = NULL;
   g_node_destroy (node);
@@ -210,13 +373,81 @@ g_node_test (void)
       if ((i%5) == 4)
 	node = node->children->next;
     }
-  TEST (NULL, g_node_max_height (root) > 100);
-  TEST (NULL, g_node_n_nodes (root, G_TRAVERSE_ALL) == 1 + 2048);
+  g_assert (g_node_max_height (root) > 100);
+  g_assert (g_node_n_nodes (root, G_TRAVERSE_ALL) == 1 + 2048);
 
   g_node_destroy (root);
-  
-  if (!failed)
-    g_print ("ok\n");
+#undef C2P
+#undef P2C
+}
+
+static gint
+my_compare (gconstpointer a,
+	    gconstpointer b)
+{
+  const char *cha = a;
+  const char *chb = b;
+
+  return *cha - *chb;
+}
+
+static gint
+my_traverse (gpointer key,
+	     gpointer value,
+	     gpointer data)
+{
+  char *ch = key;
+  g_print ("%c ", *ch);
+  return FALSE;
+}
+
+static void
+binary_tree_test (void)
+{
+  GTree *tree;
+  char chars[62];
+  guint i, j;
+
+  tree = g_tree_new (my_compare);
+  i = 0;
+  for (j = 0; j < 10; j++, i++)
+    {
+      chars[i] = '0' + j;
+      g_tree_insert (tree, &chars[i], &chars[i]);
+    }
+  for (j = 0; j < 26; j++, i++)
+    {
+      chars[i] = 'A' + j;
+      g_tree_insert (tree, &chars[i], &chars[i]);
+    }
+  for (j = 0; j < 26; j++, i++)
+    {
+      chars[i] = 'a' + j;
+      g_tree_insert (tree, &chars[i], &chars[i]);
+    }
+
+  g_assert_cmpint (g_tree_nnodes (tree), ==, 10 + 26 + 26);
+  g_assert_cmpint (g_tree_height (tree), ==, 6);
+
+  if (g_test_verbose())
+    {
+      g_print ("tree: ");
+      g_tree_foreach (tree, my_traverse, NULL);
+      g_print ("\n");
+    }
+
+  for (i = 0; i < 10; i++)
+    g_tree_remove (tree, &chars[i]);
+
+  g_assert_cmpint (g_tree_nnodes (tree), ==, 26 + 26);
+  g_assert_cmpint (g_tree_height (tree), ==, 6);
+
+  if (g_test_verbose())
+    {
+      g_print ("tree: ");
+      g_tree_foreach (tree, my_traverse, NULL);
+      g_print ("\n");
+    }
 }
 
 static gboolean
@@ -265,49 +496,6 @@ my_hash_equal (gconstpointer a,
   return *((const gint*) a) == *((const gint*) b);
 }
 
-static gint
-my_list_compare_one (gconstpointer a, gconstpointer b)
-{
-  gint one = *((const gint*)a);
-  gint two = *((const gint*)b);
-  return one-two;
-}
-
-static gint
-my_list_compare_two (gconstpointer a, gconstpointer b)
-{
-  gint one = *((const gint*)a);
-  gint two = *((const gint*)b);
-  return two-one;
-}
-
-/* static void
-my_list_print (gpointer a, gpointer b)
-{
-  gint three = *((gint*)a);
-  g_print("%d", three);
-}; */
-
-static gint
-my_compare (gconstpointer a,
-	    gconstpointer b)
-{
-  const char *cha = a;
-  const char *chb = b;
-
-  return *cha - *chb;
-}
-
-static gint
-my_traverse (gpointer key,
-	     gpointer value,
-	     gpointer data)
-{
-  char *ch = key;
-  g_print ("%c ", *ch);
-  return FALSE;
-}
-
 static gboolean 
 find_first_that(gpointer key, 
 		gpointer value, 
@@ -319,7 +507,7 @@ find_first_that(gpointer key,
 }
 
 
-static gboolean
+static void
 test_g_mkdir_with_parents_1 (const gchar *base)
 {
   char *p0 = g_build_filename (base, "fum", NULL);
@@ -332,104 +520,69 @@ test_g_mkdir_with_parents_1 (const gchar *base)
   g_remove (p0);
 
   if (g_file_test (p0, G_FILE_TEST_EXISTS))
-    {
-      g_print ("failed, %s exists, cannot test g_mkdir_with_parents\n", p0);
-      return FALSE;
-    }
+    g_error ("failed, %s exists, cannot test g_mkdir_with_parents\n", p0);
 
   if (g_file_test (p1, G_FILE_TEST_EXISTS))
-    {
-      g_print ("failed, %s exists, cannot test g_mkdir_with_parents\n", p1);
-      return FALSE;
-    }
+    g_error ("failed, %s exists, cannot test g_mkdir_with_parents\n", p1);
 
   if (g_file_test (p2, G_FILE_TEST_EXISTS))
-    {
-      g_print ("failed, %s exists, cannot test g_mkdir_with_parents\n", p2);
-      return FALSE;
-    }
+    g_error ("failed, %s exists, cannot test g_mkdir_with_parents\n", p2);
 
-  if (g_mkdir_with_parents (p2, 0666) == -1)
-    {
-      g_print ("failed, g_mkdir_with_parents(%s) failed: %s\n", p2, g_strerror (errno));
-      return FALSE;
-    }
+  if (g_mkdir_with_parents (p2, 0777) == -1)
+    g_error ("failed, g_mkdir_with_parents(%s) failed: %s\n", p2, g_strerror (errno));
 
   if (!g_file_test (p2, G_FILE_TEST_IS_DIR))
-    {
-      g_print ("failed, g_mkdir_with_parents(%s) succeeded, but %s is not a directory\n", p2, p2);
-      return FALSE;
-    }
+    g_error ("failed, g_mkdir_with_parents(%s) succeeded, but %s is not a directory\n", p2, p2);
 
   if (!g_file_test (p1, G_FILE_TEST_IS_DIR))
-    {
-      g_print ("failed, g_mkdir_with_parents(%s) succeeded, but %s is not a directory\n", p2, p1);
-      return FALSE;
-    }
+    g_error ("failed, g_mkdir_with_parents(%s) succeeded, but %s is not a directory\n", p2, p1);
 
   if (!g_file_test (p0, G_FILE_TEST_IS_DIR))
-    {
-      g_print ("failed, g_mkdir_with_parents(%s) succeeded, but %s is not a directory\n", p2, p0);
-      return FALSE;
-    }
+    g_error ("failed, g_mkdir_with_parents(%s) succeeded, but %s is not a directory\n", p2, p0);
 
   g_rmdir (p2);
   if (g_file_test (p2, G_FILE_TEST_EXISTS))
-    {
-      g_print ("failed, did g_rmdir(%s), but %s is still there\n", p2, p2);
-      return FALSE;
-    }
+    g_error ("failed, did g_rmdir(%s), but %s is still there\n", p2, p2);
 
   g_rmdir (p1);
   if (g_file_test (p1, G_FILE_TEST_EXISTS))
-    {
-      g_print ("failed, did g_rmdir(%s), but %s is still there\n", p1, p1);
-      return FALSE;
-    }
+    g_error ("failed, did g_rmdir(%s), but %s is still there\n", p1, p1);
 
   f = g_fopen (p1, "w");
   if (f == NULL)
-    {
-      g_print ("failed, couldn't create file %s\n", p1);
-      return FALSE;
-    }
+    g_error ("failed, couldn't create file %s\n", p1);
   fclose (f);
-  
+
   if (g_mkdir_with_parents (p1, 0666) == 0)
-    {
-      g_print ("failed, g_mkdir_with_parents(%s) succeeded, even if %s is a file\n", p1, p1);
-      return FALSE;
-    }
+    g_error ("failed, g_mkdir_with_parents(%s) succeeded, even if %s is a file\n", p1, p1);
 
   if (g_mkdir_with_parents (p2, 0666) == 0)
-    {
-      g_print ("failed, g_mkdir_with_parents(%s) succeeded, even if %s is a file\n", p2, p1);
-      return FALSE;
-    }
+    g_error("failed, g_mkdir_with_parents(%s) succeeded, even if %s is a file\n", p2, p1);
 
   g_remove (p2);
   g_remove (p1);
   g_remove (p0);
-
-  return TRUE;
 }
 
-static gboolean
+static void
 test_g_mkdir_with_parents (void)
 {
-  g_print ("checking g_mkdir_with_parents()...");
-  if (!test_g_mkdir_with_parents_1 ("hum"))
-    return FALSE;
+  gchar *cwd;
+  if (g_test_verbose())
+    g_print ("checking g_mkdir_with_parents() in subdir ./hum/");
+  test_g_mkdir_with_parents_1 ("hum");
   g_remove ("hum");
-  if (!test_g_mkdir_with_parents_1 ("hii///haa/hee"))
-    return FALSE;
+  if (g_test_verbose())
+    g_print ("checking g_mkdir_with_parents() in subdir ./hii///haa/hee/");
+  test_g_mkdir_with_parents_1 ("hii///haa/hee");
   g_remove ("hii/haa/hee");
   g_remove ("hii/haa");
   g_remove ("hii");
-  if (!test_g_mkdir_with_parents_1 (g_get_current_dir ()))
-    return FALSE;
-
-  return TRUE;
+  cwd = g_get_current_dir ();
+  if (g_test_verbose())
+    g_print ("checking g_mkdir_with_parents() in cwd: %s", cwd);
+  test_g_mkdir_with_parents_1 (cwd);
+  g_free (cwd);
 }
 
 static void
@@ -456,41 +609,257 @@ test_g_parse_debug_string (void)
   g_assert (result == 0);
 }
 
+static void
+log_warning_error_tests (void)
+{
+  if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR))
+    {
+      g_message ("this is a g_message test.");
+      g_message ("non-printable UTF-8: \"\xc3\xa4\xda\x85\"");
+      g_message ("unsafe chars: \"\x10\x11\x12\n\t\x7f\x81\x82\x83\"");
+      exit (0);
+    }
+  g_test_trap_assert_passed();
+  g_test_trap_assert_stderr ("*is a g_message test*");
+  g_test_trap_assert_stderr ("*non-printable UTF-8*");
+  g_test_trap_assert_stderr ("*unsafe chars*");
+  if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR))
+    {
+      g_warning ("harmless warning with parameters: %d %s %#x", 42, "Boo", 12345);
+      exit (0);
+    }
+  g_test_trap_assert_failed(); /* we have fatal-warnings enabled */
+  g_test_trap_assert_stderr ("*harmless warning*");
+  if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR))
+    {
+      g_print (NULL);
+      exit (0);
+    }
+  g_test_trap_assert_failed(); /* we have fatal-warnings enabled */
+  g_test_trap_assert_stderr ("*g_print*assertion*failed*");
+  g_test_trap_assert_stderr ("*NULL*");
+}
 
-int
-main (int   argc,
-      char *argv[])
+static void
+timer_tests (void)
 {
-  const gchar *s;
-  gchar **sv;
-  GList *list, *t;
-  GSList *slist, *st;
-  GHashTable *hash_table;
-  GMemChunk *mem_chunk;
-  GStringChunk *string_chunk;
   GTimer *timer, *timer2;
   gdouble elapsed;
-  gulong elapsed_usecs;
-  gint nums[10] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-  gint morenums[10] = { 8, 9, 7, 0, 3, 2, 5, 1, 4, 6};
-  gchar *string;
-  gint value = 120; 
-  gint *pvalue=NULL;
-  GTimeVal ref_date, date;
-  gchar *date_str;
+
+  /* basic testing */
+  timer = g_timer_new ();
+  g_timer_start (timer);
+  elapsed = g_timer_elapsed (timer, NULL);
+  g_timer_stop (timer);
+  g_assert_cmpfloat (elapsed, <=, g_timer_elapsed (timer, NULL));
+  g_timer_destroy (timer);
+
+  if (g_test_slow())
+    {
+      if (g_test_verbose())
+        g_print ("checking timers...\n");
+      timer = g_timer_new ();
+      if (g_test_verbose())
+        g_print ("  spinning for 3 seconds...\n");
+      g_timer_start (timer);
+      while (g_timer_elapsed (timer, NULL) < 3)
+        ;
+      g_timer_stop (timer);
+      g_timer_destroy (timer);
+      if (g_test_verbose())
+        g_print ("ok\n");
+    }
+
+  if (g_test_slow())
+    {
+      gulong elapsed_usecs;
+      if (g_test_verbose())
+        g_print ("checking g_timer_continue...\n");
+      timer2 = g_timer_new ();
+      if (g_test_verbose())
+        g_print ("\trun for 1 second...\n");
+      timer = g_timer_new();
+      g_usleep (G_USEC_PER_SEC); /* run timer for 1 second */
+      g_timer_stop (timer);
+      if (g_test_verbose())
+        g_print ("\tstop for 1 second...\n");
+      g_usleep (G_USEC_PER_SEC); /* wait for 1 second */
+      if (g_test_verbose())
+        g_print ("\trun for 2 seconds...\n");
+      g_timer_continue (timer);
+      g_usleep (2 * G_USEC_PER_SEC); /* run timer for 2 seconds */
+      g_timer_stop(timer);
+      if (g_test_verbose())
+        g_print ("\tstop for 1.5 seconds...\n");
+      g_usleep ((3 * G_USEC_PER_SEC) / 2); /* wait for 1.5 seconds */
+      if (g_test_verbose())
+        g_print ("\trun for 0.2 seconds...\n");
+      g_timer_continue (timer);
+      g_usleep (G_USEC_PER_SEC / 5); /* run timer for 0.2 seconds */
+      g_timer_stop (timer);
+      if (g_test_verbose())
+        g_print ("\tstop for 4 seconds...\n");
+      g_usleep (4 * G_USEC_PER_SEC); /* wait for 4 seconds */
+      if (g_test_verbose())
+        g_print ("\trun for 5.8 seconds...\n");
+      g_timer_continue (timer);
+      g_usleep ((29 * G_USEC_PER_SEC) / 5); /* run timer for 5.8 seconds */
+      g_timer_stop(timer);
+      elapsed = g_timer_elapsed (timer, &elapsed_usecs);
+      if (g_test_verbose())
+        g_print ("\t=> timer = %.6f = %d.%06ld (should be: 9.000000) (%.6f off)\n", elapsed, (int) elapsed, elapsed_usecs, ABS (elapsed - 9.));
+      g_assert_cmpfloat (elapsed, >, 8.8);
+      g_assert_cmpfloat (elapsed, <, 9.2);
+      if (g_test_verbose())
+        g_print ("g_timer_continue ... ok\n\n");
+      g_timer_stop (timer2);
+      elapsed = g_timer_elapsed (timer2, &elapsed_usecs);
+      if (g_test_verbose())
+        g_print ("\t=> timer2 = %.6f = %d.%06ld (should be: %.6f) (%.6f off)\n\n", elapsed, (int) elapsed, elapsed_usecs, 9.+6.5, ABS (elapsed - (9.+6.5)));
+      g_assert_cmpfloat (elapsed, >, 8.8 + 6.5);
+      g_assert_cmpfloat (elapsed, <, 9.2 + 6.5);
+      if (g_test_verbose())
+        g_print ("timer2 ... ok\n\n");
+      g_timer_destroy (timer);
+      g_timer_destroy (timer2);
+    }
+}
+
+static void
+type_sizes (void)
+{
+  guint16 gu16t1 = 0x44afU, gu16t2 = 0xaf44U;
+  guint32 gu32t1 = 0x02a7f109U, gu32t2 = 0x09f1a702U;
+  guint64 gu64t1 = G_GINT64_CONSTANT(0x1d636b02300a7aa7U),
+	  gu64t2 = G_GINT64_CONSTANT(0xa77a0a30026b631dU);
+  /* type sizes */
+  g_assert_cmpint (sizeof (gint8), ==, 1);
+  g_assert_cmpint (sizeof (gint16), ==, 2);
+  g_assert_cmpint (sizeof (gint32), ==, 4);
+  g_assert_cmpint (sizeof (gint64), ==, 8);
+  /* endian macros */
+  if (g_test_verbose())
+    g_print ("checking endian macros (host is %s)...\n",
+             G_BYTE_ORDER == G_BIG_ENDIAN ? "big endian" : "little endian");
+  g_assert (GUINT16_SWAP_LE_BE (gu16t1) == gu16t2);
+  g_assert (GUINT32_SWAP_LE_BE (gu32t1) == gu32t2);
+  g_assert (GUINT64_SWAP_LE_BE (gu64t1) == gu64t2);
+}
+
+static void
+test_info (void)
+{
+  const gchar *un, *rn, *hn;
+  const gchar *tmpdir, *homedir, *userdatadir, *uconfdir, *ucachedir;
+  const gchar *uddesktop, *udddocs, *uddpubshare;
+  gchar **sv, *cwd, *sdatadirs, *sconfdirs, *langnames;
+  if (g_test_verbose())
+    g_print ("TestGLib v%u.%u.%u (i:%u b:%u)\n",
+             glib_major_version,
+             glib_minor_version,
+             glib_micro_version,
+             glib_interface_age,
+             glib_binary_age);
+
+  cwd = g_get_current_dir ();
+  un = g_get_user_name();
+  rn = g_get_real_name();
+  hn = g_get_host_name();
+  if (g_test_verbose())
+    {
+      g_print ("cwd: %s\n", cwd);
+      g_print ("user: %s\n", un);
+      g_print ("real: %s\n", rn);
+      g_print ("host: %s\n", hn);
+    }
+  g_free (cwd);
+
+  tmpdir = g_get_tmp_dir();
+  g_assert (tmpdir != NULL);
+  homedir = g_get_home_dir ();
+  g_assert (homedir != NULL);
+  userdatadir = g_get_user_data_dir ();
+  g_assert (userdatadir != NULL);
+  uconfdir = g_get_user_config_dir ();
+  g_assert (uconfdir != NULL);
+  ucachedir = g_get_user_cache_dir ();
+  g_assert (ucachedir != NULL);
+
+  uddesktop = g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP);
+  g_assert (uddesktop != NULL);
+  udddocs = g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS);
+  g_assert (udddocs != NULL);
+  uddpubshare = g_get_user_special_dir (G_USER_DIRECTORY_PUBLIC_SHARE);
+  g_assert (uddpubshare != NULL);
+
+  sv = (gchar **) g_get_system_data_dirs ();
+  sdatadirs = g_strjoinv (G_SEARCHPATH_SEPARATOR_S, sv);
+  sv = (gchar **) g_get_system_config_dirs ();
+  sconfdirs = g_strjoinv (G_SEARCHPATH_SEPARATOR_S, sv);
+  sv = (gchar **) g_get_language_names ();
+  langnames = g_strjoinv (":", sv);
+
+  if (g_test_verbose())
+    {
+      g_print ("tmp-dir: %s\n", tmpdir);
+      g_print ("home: %s\n", homedir);
+      g_print ("user_data: %s\n", userdatadir);
+      g_print ("user_config: %s\n", uconfdir);
+      g_print ("user_cache: %s\n", ucachedir);
+      g_print ("system_data: %s\n", sdatadirs);
+      g_print ("system_config: %s\n", sconfdirs);
+      g_print ("languages: %s\n", langnames);
+      g_print ("user_special[DESKTOP]: %s\n", uddesktop);
+      g_print ("user_special[DOCUMENTS]: %s\n", udddocs);
+      g_print ("user_special[PUBLIC_SHARE]: %s\n", uddpubshare);
+    }
+  g_free (sdatadirs);
+  g_free (sconfdirs);
+  g_free (langnames);
   
-  gchar *mem[10000], *tmp_string = NULL, *tmp_string_2;
-  gint i, j;
-  GArray *garray;
-  GPtrArray *gparray;
-  GByteArray *gbarray;
-  GString *string1, *string2;
-  const gchar *charset;
-  GTree *tree;
-  char chars[62];
-  GRelation *relation;
-  GTuples *tuples;
-  gint data [1024];
+  if (g_test_verbose())
+    {
+      const gchar *charset;
+      if (g_get_charset ((G_CONST_RETURN char**)&charset))
+        g_print ("current charset is UTF-8: %s\n", charset);
+      else
+        g_print ("current charset is not UTF-8: %s\n", charset);
+
+#ifdef G_PLATFORM_WIN32
+#ifdef G_OS_WIN32
+      /* Can't calculate GLib DLL name at runtime. */
+      gchar *glib_dll = "libglib-2.0-0.dll";
+#endif
+#ifdef G_WITH_CYGWIN
+      gchar *glib_dll = "cygglib-2.0-0.dll";
+#endif
+
+      g_print ("current locale: %s\n", g_win32_getlocale ());
+      g_print ("GLib DLL name tested for: %s\n", glib_dll);
+
+      g_print ("GLib installation directory, from Registry entry for %s if available: %s\n",
+               GETTEXT_PACKAGE,
+               g_win32_get_package_installation_directory (GETTEXT_PACKAGE, NULL));
+      g_print ("Ditto, or from GLib DLL name: %s\n",
+               g_win32_get_package_installation_directory (GETTEXT_PACKAGE, glib_dll));
+      g_print ("Ditto, only from GLib DLL name: %s\n",
+               g_win32_get_package_installation_directory (NULL, glib_dll));
+      g_print ("locale subdirectory of GLib installation directory: %s\n",
+               g_win32_get_package_installation_subdirectory (NULL, glib_dll, "lib\\locale"));
+      g_print ("GTK+ 2.0 installation directory, if available: %s\n",
+               g_win32_get_package_installation_directory ("gtk20", NULL));
+
+      g_print ("found more.com as %s\n", g_find_program_in_path ("more.com"));
+      g_print ("found regedit as %s\n", g_find_program_in_path ("regedit"));
+
+      g_print ("a Win32 error message: %s\n", g_win32_error_message (2));
+#endif
+    }
+}
+
+static void
+test_paths (void)
+{
   struct {
     gchar *filename;
     gchar *dirname;
@@ -521,8 +890,7 @@ main (int   argc,
     { "..", "." },
     { "", "." },
   };
-  guint n_dirname_checks = G_N_ELEMENTS (dirname_checks);
-
+  const guint n_dirname_checks = G_N_ELEMENTS (dirname_checks);
   struct {
     gchar *filename;
     gchar *without_root;
@@ -545,85 +913,20 @@ main (int   argc,
     { ".", NULL },
     { "", NULL },
   };
-  guint n_skip_root_checks = G_N_ELEMENTS (skip_root_checks);
-
-#ifndef G_DISABLE_ASSERT
-  guint16 gu16t1 = 0x44afU, gu16t2 = 0xaf44U;
-  guint32 gu32t1 = 0x02a7f109U, gu32t2 = 0x09f1a702U;
-  guint64 gu64t1 = G_GINT64_CONSTANT(0x1d636b02300a7aa7U),
-	  gu64t2 = G_GINT64_CONSTANT(0xa77a0a30026b631dU);
-#endif
-  const char hello[] = "Hello, World";
-  const int hellolen = sizeof (hello) - 1;
-  int fd;
-  char template[32];
-  GError *error;
-  char *name_used;
-#ifdef G_OS_WIN32
-  /* Can't calculate GLib DLL name at runtime. */
-  gchar *glib_dll = "libglib-2.0-0.dll";
-#endif
-#ifdef G_WITH_CYGWIN
-  gchar *glib_dll = "cygglib-2.0-0.dll";
-#endif
-
-  g_print ("TestGLib v%u.%u.%u (i:%u b:%u)\n",
-	   glib_major_version,
-	   glib_minor_version,
-	   glib_micro_version,
-	   glib_interface_age,
-	   glib_binary_age);
-
-  string = g_get_current_dir ();
-  g_print ("cwd: %s\n", string);
-  g_free (string);
-  g_print ("user: %s\n", g_get_user_name ());
-  g_print ("real: %s\n", g_get_real_name ());
-  g_print ("host: %s\n", g_get_host_name ());
-  s = g_get_home_dir ();
-  g_print ("home: %s\n", s ? s : "NULL!");
-  s = g_get_user_data_dir ();
-  g_print ("user_data: %s\n", s ? s : "NULL!");
-  s = g_get_user_config_dir ();
-  g_print ("user_config: %s\n", s ? s : "NULL!");
-  s = g_get_user_cache_dir ();
-  g_print ("user_cache: %s\n", s ? s : "NULL!");
-  sv = (gchar **) g_get_system_data_dirs ();
-  g_print ("system_data: %s\n", sv ? g_strjoinv (G_SEARCHPATH_SEPARATOR_S, sv) : "NULL!");
-  sv = (gchar **) g_get_system_config_dirs ();
-  g_print ("system_config: %s\n", s ? g_strjoinv (G_SEARCHPATH_SEPARATOR_S, sv) : "NULL!");
-  g_print ("tmp-dir: %s\n", g_get_tmp_dir ());
-  sv = (gchar **) g_get_language_names ();
-  g_print ("languages: %s\n", s ? g_strjoinv (":", sv) : "NULL!");
-
-  /* special dirs */
-  s = g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP);
-  g_print ("user_special[DESKTOP]: %s\n", s ? s : "NULL!");
-  s = g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS);
-  g_print ("user_special[DOCUMENTS]: %s\n", s ? s : "NULL!");
-  s = g_get_user_special_dir (G_USER_DIRECTORY_PUBLIC_SHARE);
-  g_print ("user_special[PUBLIC_SHARE]: %s\n", s ? s : "NULL!");
-
-  /* type sizes */
-  g_print ("checking size of gint8: %"    G_GSIZE_FORMAT, sizeof (gint8));
-  TEST (NULL, sizeof (gint8) == 1);
-  g_print ("\nchecking size of gint16: %" G_GSIZE_FORMAT, sizeof (gint16));
-  TEST (NULL, sizeof (gint16) == 2);
-  g_print ("\nchecking size of gint32: %" G_GSIZE_FORMAT, sizeof (gint32));
-  TEST (NULL, sizeof (gint32) == 4);
-  g_print ("\nchecking size of gsize: %"  G_GSIZE_FORMAT, sizeof (gsize));
-  g_print ("\nchecking size of gint64: %" G_GSIZE_FORMAT, sizeof (gint64));
-  TEST (NULL, sizeof (gint64) == 8);
-  g_print ("\n");
-
-  g_print ("checking g_path_get_basename()...");
+  const guint n_skip_root_checks = G_N_ELEMENTS (skip_root_checks);
+  gchar *string;
+  guint i;
+  if (g_test_verbose())
+    g_print ("checking g_path_get_basename()...");
   string = g_path_get_basename (G_DIR_SEPARATOR_S "foo" G_DIR_SEPARATOR_S "dir" G_DIR_SEPARATOR_S);
   g_assert (strcmp (string, "dir") == 0);
   g_free (string);
   string = g_path_get_basename (G_DIR_SEPARATOR_S "foo" G_DIR_SEPARATOR_S "file");
   g_assert (strcmp (string, "file") == 0);
   g_free (string);
-  g_print ("ok\n");
+  if (g_test_verbose())
+    g_print ("ok\n");
+
 #ifdef G_OS_WIN32
   string = g_path_get_basename ("/foo/dir/");
   g_assert (strcmp (string, "dir") == 0);
@@ -633,268 +936,181 @@ main (int   argc,
   g_free (string);
 #endif
 
-  g_print ("checking g_path_get_dirname()...");
+  if (g_test_verbose())
+    g_print ("checking g_path_get_dirname()...");
   for (i = 0; i < n_dirname_checks; i++)
     {
-      gchar *dirname;
-
-      dirname = g_path_get_dirname (dirname_checks[i].filename);
+      gchar *dirname = g_path_get_dirname (dirname_checks[i].filename);
       if (strcmp (dirname, dirname_checks[i].dirname) != 0)
 	{
-	  g_print ("\nfailed for \"%s\"==\"%s\" (returned: \"%s\")\n",
+	  g_error ("\nfailed for \"%s\"==\"%s\" (returned: \"%s\")\n",
 		   dirname_checks[i].filename,
 		   dirname_checks[i].dirname,
 		   dirname);
-	  n_dirname_checks = 0;
 	}
       g_free (dirname);
     }
-  if (n_dirname_checks)
+  if (g_test_verbose())
     g_print ("ok\n");
 
-  g_print ("checking g_path_skip_root()...");
+  if (g_test_verbose())
+    g_print ("checking g_path_skip_root()...");
   for (i = 0; i < n_skip_root_checks; i++)
     {
-      const gchar *skipped;
-
-      skipped = g_path_skip_root (skip_root_checks[i].filename);
+      const gchar *skipped = g_path_skip_root (skip_root_checks[i].filename);
       if ((skipped && !skip_root_checks[i].without_root) ||
 	  (!skipped && skip_root_checks[i].without_root) ||
 	  ((skipped && skip_root_checks[i].without_root) &&
 	   strcmp (skipped, skip_root_checks[i].without_root)))
 	{
-	  g_print ("\nfailed for \"%s\"==\"%s\" (returned: \"%s\")\n",
+	  g_error ("\nfailed for \"%s\"==\"%s\" (returned: \"%s\")\n",
 		   skip_root_checks[i].filename,
 		   (skip_root_checks[i].without_root ?
 		    skip_root_checks[i].without_root : "<NULL>"),
 		   (skipped ? skipped : "<NULL>"));
-	  n_skip_root_checks = 0;
 	}
     }
-  if (n_skip_root_checks)
-    g_print ("ok\n");
-
-  if (test_g_mkdir_with_parents ())
+  if (g_test_verbose())
     g_print ("ok\n");
+}
 
-  g_print ("checking doubly linked lists...");
-
-  list = NULL;
-  for (i = 0; i < 10; i++)
-    list = g_list_append (list, &nums[i]);
-  list = g_list_reverse (list);
-
-  for (i = 0; i < 10; i++)
-    {
-      t = g_list_nth (list, i);
-      if (*((gint*) t->data) != (9 - i))
-	g_error ("Regular insert failed");
-    }
-
-  for (i = 0; i < 10; i++)
-    if(g_list_position(list, g_list_nth (list, i)) != i)
-      g_error("g_list_position does not seem to be the inverse of g_list_nth\n");
-
-  g_list_free (list);
-  list = NULL;
-
-  for (i = 0; i < 10; i++)
-    list = g_list_insert_sorted (list, &morenums[i], my_list_compare_one);
-
-  /*
-  g_print("\n");
-  g_list_foreach (list, my_list_print, NULL);
-  */
-
-  for (i = 0; i < 10; i++)
-    {
-      t = g_list_nth (list, i);
-      if (*((gint*) t->data) != i)
-         g_error ("Sorted insert failed");
-    }
-
-  g_list_free (list);
-  list = NULL;
-
-  for (i = 0; i < 10; i++)
-    list = g_list_insert_sorted (list, &morenums[i], my_list_compare_two);
-
-  /*
-  g_print("\n");
-  g_list_foreach (list, my_list_print, NULL);
-  */
-
-  for (i = 0; i < 10; i++)
-    {
-      t = g_list_nth (list, i);
-      if (*((gint*) t->data) != (9 - i))
-         g_error ("Sorted insert failed");
-    }
-
-  g_list_free (list);
-  list = NULL;
-
-  for (i = 0; i < 10; i++)
-    list = g_list_prepend (list, &morenums[i]);
-
-  list = g_list_sort (list, my_list_compare_two);
-
-  /*
-  g_print("\n");
-  g_list_foreach (list, my_list_print, NULL);
-  */
-
-  for (i = 0; i < 10; i++)
-    {
-      t = g_list_nth (list, i);
-      if (*((gint*) t->data) != (9 - i))
-         g_error ("Merge sort failed");
-    }
-
-  g_list_free (list);
-
-  g_print ("ok\n");
-
-
-  g_print ("checking singly linked lists...");
-
-  slist = NULL;
-  for (i = 0; i < 10; i++)
-    slist = g_slist_append (slist, &nums[i]);
-  slist = g_slist_reverse (slist);
-
-  for (i = 0; i < 10; i++)
-    {
-      st = g_slist_nth (slist, i);
-      if (*((gint*) st->data) != (9 - i))
-	g_error ("failed");
-    }
-
-  g_slist_free (slist);
-  slist = NULL;
-
-  for (i = 0; i < 10; i++)
-    slist = g_slist_insert_sorted (slist, &morenums[i], my_list_compare_one);
-
-  /*
-  g_print("\n");
-  g_slist_foreach (slist, my_list_print, NULL);
-  */
-
-  for (i = 0; i < 10; i++)
-    {
-      st = g_slist_nth (slist, i);
-      if (*((gint*) st->data) != i)
-         g_error ("Sorted insert failed");
-    }
+static void
+test_file_functions (void)
+{
+  const char hello[] = "Hello, World";
+  const int hellolen = sizeof (hello) - 1;
+  GError *error;
+  char template[32];
+  char *name_used, chars[62];
+  gint fd, n;
+  
+  strcpy (template, "foobar");
+  fd = g_mkstemp (template);
+  if (g_test_verbose() && fd != -1)
+    g_print ("g_mkstemp works even if template doesn't end in XXXXXX\n");
+  close (fd);
+  strcpy (template, "fooXXXXXX");
+  fd = g_mkstemp (template);
+  if (fd == -1)
+    g_error ("g_mkstemp didn't work for template %s\n", template);
+  n = write (fd, hello, hellolen);
+  if (n == -1)
+    g_error ("write() failed: %s\n", g_strerror (errno));
+  else if (n != hellolen)
+    g_error ("write() should have written %d bytes, wrote %d\n", hellolen, n);
 
-  g_slist_free(slist);
-  slist = NULL;
+  lseek (fd, 0, 0);
+  n = read (fd, chars, sizeof (chars));
+  if (n == -1)
+    g_error ("read() failed: %s\n", g_strerror (errno));
+  else if (n != hellolen)
+    g_error ("read() should have read %d bytes, got %d\n", hellolen, n);
 
-  for (i = 0; i < 10; i++)
-    slist = g_slist_insert_sorted (slist, &morenums[i], my_list_compare_two);
+  chars[n] = 0;
+  if (strcmp (chars, hello) != 0)
+    g_error ("wrote '%s', but got '%s'\n", hello, chars);
 
-  /*
-  g_print("\n");
-  g_slist_foreach (slist, my_list_print, NULL);
-  */
+  close (fd);
+  remove (template);
 
-  for (i = 0; i < 10; i++)
+  error = NULL;
+  strcpy (template, "zap" G_DIR_SEPARATOR_S "barXXXXXX");
+  fd = g_file_open_tmp (template, &name_used, &error);
+  if (g_test_verbose())
     {
-      st = g_slist_nth (slist, i);
-      if (*((gint*) st->data) != (9 - i))
-         g_error("Sorted insert failed");
+      if (fd != -1)
+        g_print ("g_file_open_tmp works even if template contains '%s'\n", G_DIR_SEPARATOR_S);
+      else
+        g_print ("g_file_open_tmp correctly returns error: %s\n", error->message);
     }
+  close (fd);
+  g_clear_error (&error);
 
-  g_slist_free(slist);
-  slist = NULL;
-
-  for (i = 0; i < 10; i++)
-    slist = g_slist_prepend (slist, &morenums[i]);
-
-  slist = g_slist_sort (slist, my_list_compare_two);
-
-  /*
-  g_print("\n");
-  g_slist_foreach (slist, my_list_print, NULL);
-  */
-
-  for (i = 0; i < 10; i++)
-    {
-      st = g_slist_nth (slist, i);
-      if (*((gint*) st->data) != (9 - i))
-         g_error("Sorted insert failed");
-    }
-
-  g_slist_free(slist);
-
-  g_print ("ok\n");
-
-
-  g_print ("checking binary trees...\n");
-
-  tree = g_tree_new (my_compare);
-  i = 0;
-  for (j = 0; j < 10; j++, i++)
-    {
-      chars[i] = '0' + j;
-      g_tree_insert (tree, &chars[i], &chars[i]);
-    }
-  for (j = 0; j < 26; j++, i++)
-    {
-      chars[i] = 'A' + j;
-      g_tree_insert (tree, &chars[i], &chars[i]);
-    }
-  for (j = 0; j < 26; j++, i++)
+#ifdef G_OS_WIN32
+  strcpy (template, "zap/barXXXXXX");
+  fd = g_file_open_tmp (template, &name_used, &error);
+  if (g_test_verbose())
     {
-      chars[i] = 'a' + j;
-      g_tree_insert (tree, &chars[i], &chars[i]);
+      if (fd != -1)
+        g_print ("g_file_open_tmp works even if template contains '/'\n");
+      else
+        g_print ("g_file_open_tmp correctly returns error: %s\n", error->message);
     }
+  close (fd);
+  g_clear_error (&error);
+#endif
 
-  g_print ("tree height: %d\n", g_tree_height (tree));
-  g_print ("tree nnodes: %d\n", g_tree_nnodes (tree));
-
-  g_print ("tree: ");
-  g_tree_foreach (tree, my_traverse, NULL);
-  g_print ("\n");
-
-  for (i = 0; i < 10; i++)
-    g_tree_remove (tree, &chars[i]);
-
-  g_print ("tree height: %d\n", g_tree_height (tree));
-  g_print ("tree nnodes: %d\n", g_tree_nnodes (tree));
-
-  g_print ("tree: ");
-  g_tree_foreach (tree, my_traverse, NULL);
-  g_print ("\n");
-
-  g_print ("ok\n");
-
-
-  /* check n-way trees */
-  g_node_test ();
+  strcpy (template, "zapXXXXXX");
+  fd = g_file_open_tmp (template, &name_used, &error);
+  if (fd == -1)
+    g_error ("g_file_open_tmp didn't work for template '%s': %s\n", template, error->message);
+  else if (g_test_verbose())
+    g_print ("g_file_open_tmp for template '%s' used name '%s'\n", template, name_used);
+  close (fd);
+  g_clear_error (&error);
+  remove (name_used);
 
-  g_print ("checking mem chunks...");
+  fd = g_file_open_tmp (NULL, &name_used, &error);
+  if (fd == -1)
+    g_error ("g_file_open_tmp didn't work for a NULL template: %s\n", error->message);
+  close (fd);
+  g_clear_error (&error);
+  remove (name_used);
+}
 
-  mem_chunk = g_mem_chunk_new ("test mem chunk", 50, 100, G_ALLOC_AND_FREE);
+static void
+test_arrays (void)
+{
+  GByteArray *gbarray;
+  GPtrArray *gparray;
+  GArray *garray;
+  guint i;
 
+  gparray = g_ptr_array_new ();
   for (i = 0; i < 10000; i++)
-    {
-      mem[i] = g_chunk_new (gchar, mem_chunk);
-
-      for (j = 0; j < 50; j++)
-	mem[i][j] = i * j;
-    }
+    g_ptr_array_add (gparray, GINT_TO_POINTER (i));
+  for (i = 0; i < 10000; i++)
+    if (g_ptr_array_index (gparray, i) != GINT_TO_POINTER (i))
+      g_error ("array fails: %p ( %p )\n", g_ptr_array_index (gparray, i), GINT_TO_POINTER (i));
+  g_ptr_array_free (gparray, TRUE);
 
+  gbarray = g_byte_array_new ();
+  for (i = 0; i < 10000; i++)
+    g_byte_array_append (gbarray, (guint8*) "abcd", 4);
   for (i = 0; i < 10000; i++)
     {
-      g_mem_chunk_free (mem_chunk, mem[i]);
+      g_assert (gbarray->data[4*i] == 'a');
+      g_assert (gbarray->data[4*i+1] == 'b');
+      g_assert (gbarray->data[4*i+2] == 'c');
+      g_assert (gbarray->data[4*i+3] == 'd');
     }
+  g_byte_array_free (gbarray, TRUE);
 
-  g_print ("ok\n");
+  garray = g_array_new (FALSE, FALSE, sizeof (gint));
+  for (i = 0; i < 10000; i++)
+    g_array_append_val (garray, i);
+  for (i = 0; i < 10000; i++)
+    if (g_array_index (garray, gint, i) != i)
+      g_error ("failure: %d ( %d )\n", g_array_index (garray, gint, i), i);
+  g_array_free (garray, TRUE);
 
+  garray = g_array_new (FALSE, FALSE, sizeof (gint));
+  for (i = 0; i < 100; i++)
+    g_array_prepend_val (garray, i);
+  for (i = 0; i < 100; i++)
+    if (g_array_index (garray, gint, i) != (100 - i - 1))
+      g_error ("failure: %d ( %d )\n", g_array_index (garray, gint, i), 100 - i - 1);
+  g_array_free (garray, TRUE);
+}
 
-  g_print ("checking hash tables...");
+static void
+hash_table_tests (void)
+{
+  GHashTable *hash_table;
+  int array[10000];
+  gint *pvalue = NULL;
+  gint value = 120;
+  guint i;
 
   hash_table = g_hash_table_new (my_hash, my_hash_equal);
   for (i = 0; i < 10000; i++)
@@ -904,87 +1120,106 @@ main (int   argc,
     }
   pvalue = g_hash_table_find (hash_table, find_first_that, &value);
   if (*pvalue != value)
-	  g_print("g_hash_table_find failed");
-  
+    g_error ("g_hash_table_find failed");
   g_hash_table_foreach (hash_table, my_hash_callback, NULL);
-
   for (i = 0; i < 10000; i++)
     if (array[i] == 0)
-      g_print ("%d\n", i);
-
+      g_error ("hashtable-test: wrong value: %d\n", i);
   for (i = 0; i < 10000; i++)
     g_hash_table_remove (hash_table, &array[i]);
-
   for (i = 0; i < 10000; i++)
     {
       array[i] = i;
       g_hash_table_insert (hash_table, &array[i], &array[i]);
     }
-
   if (g_hash_table_foreach_remove (hash_table, my_hash_callback_remove, NULL) != 5000 ||
       g_hash_table_size (hash_table) != 5000)
-    g_print ("bad!\n");
-
+    g_error ("hashtable removal failed\n");
   g_hash_table_foreach (hash_table, my_hash_callback_remove_test, NULL);
-
-
   g_hash_table_destroy (hash_table);
+}
 
-  g_print ("ok\n");
-
+static void
+relation_test (void)
+{
+  GRelation *relation = g_relation_new (2);
+  GTuples *tuples;
+  gint data [1024];
+  guint i;
 
-  g_print ("checking string chunks...");
+  g_relation_index (relation, 0, g_int_hash, g_int_equal);
+  g_relation_index (relation, 1, g_int_hash, g_int_equal);
 
-  string_chunk = g_string_chunk_new (1024);
+  for (i = 0; i < 1024; i += 1)
+    data[i] = i;
 
-  for (i = 0; i < 100000; i ++)
+  for (i = 1; i < 1023; i += 1)
     {
-      tmp_string = g_string_chunk_insert (string_chunk, "hi pete");
-
-      if (strcmp ("hi pete", tmp_string) != 0)
-	g_error ("string chunks are broken.\n");
+      g_relation_insert (relation, data + i, data + i + 1);
+      g_relation_insert (relation, data + i, data + i - 1);
     }
 
-  tmp_string_2 = g_string_chunk_insert_const (string_chunk, tmp_string);
-
-  g_assert (tmp_string_2 != tmp_string &&
-	    strcmp(tmp_string_2, tmp_string) == 0);
-
-  tmp_string = g_string_chunk_insert_const (string_chunk, tmp_string);
-
-  g_assert (tmp_string_2 == tmp_string);
+  for (i = 2; i < 1022; i += 1)
+    {
+      g_assert (! g_relation_exists (relation, data + i, data + i));
+      g_assert (! g_relation_exists (relation, data + i, data + i + 2));
+      g_assert (! g_relation_exists (relation, data + i, data + i - 2));
+    }
 
-  g_string_chunk_free (string_chunk);
+  for (i = 1; i < 1023; i += 1)
+    {
+      g_assert (g_relation_exists (relation, data + i, data + i + 1));
+      g_assert (g_relation_exists (relation, data + i, data + i - 1));
+    }
 
-  g_print ("ok\n");
+  for (i = 2; i < 1022; i += 1)
+    {
+      g_assert (g_relation_count (relation, data + i, 0) == 2);
+      g_assert (g_relation_count (relation, data + i, 1) == 2);
+    }
 
+  g_assert (g_relation_count (relation, data, 0) == 0);
 
-  g_print ("checking arrays...");
+  g_assert (g_relation_count (relation, data + 42, 0) == 2);
+  g_assert (g_relation_count (relation, data + 43, 1) == 2);
+  g_assert (g_relation_count (relation, data + 41, 1) == 2);
+  g_relation_delete (relation, data + 42, 0);
+  g_assert (g_relation_count (relation, data + 42, 0) == 0);
+  g_assert (g_relation_count (relation, data + 43, 1) == 1);
+  g_assert (g_relation_count (relation, data + 41, 1) == 1);
 
-  garray = g_array_new (FALSE, FALSE, sizeof (gint));
-  for (i = 0; i < 10000; i++)
-    g_array_append_val (garray, i);
+  tuples = g_relation_select (relation, data + 200, 0);
 
-  for (i = 0; i < 10000; i++)
-    if (g_array_index (garray, gint, i) != i)
-      g_print ("uh oh: %d ( %d )\n", g_array_index (garray, gint, i), i);
+  g_assert (tuples->len == 2);
 
-  g_array_free (garray, TRUE);
+#if 0
+  for (i = 0; i < tuples->len; i += 1)
+    {
+      printf ("%d %d\n",
+	      *(gint*) g_tuples_index (tuples, i, 0),
+	      *(gint*) g_tuples_index (tuples, i, 1));
+    }
+#endif
 
-  garray = g_array_new (FALSE, FALSE, sizeof (gint));
-  for (i = 0; i < 100; i++)
-    g_array_prepend_val (garray, i);
+  g_assert (g_relation_exists (relation, data + 300, data + 301));
+  g_relation_delete (relation, data + 300, 0);
+  g_assert (!g_relation_exists (relation, data + 300, data + 301));
 
-  for (i = 0; i < 100; i++)
-    if (g_array_index (garray, gint, i) != (100 - i - 1))
-      g_print ("uh oh: %d ( %d )\n", g_array_index (garray, gint, i), 100 - i - 1);
+  g_tuples_destroy (tuples);
 
-  g_array_free (garray, TRUE);
+  g_relation_destroy (relation);
 
-  g_print ("ok\n");
+  relation = NULL;
+}
 
+static void
+gstring_tests (void)
+{
+  GString *string1, *string2;
+  guint i;
 
-  g_print ("checking strings...");
+  if (g_test_verbose())
+    g_print ("test GString basics\n");
 
   string1 = g_string_new ("hi pete!");
   string2 = g_string_new ("");
@@ -1012,14 +1247,19 @@ main (int   argc,
 		   10, 666, 15, 15, 666.666666666, 666.666666666);
 #endif
 
-  g_print ("string2 length = %lu...\n", (gulong)string2->len);
+  if (g_test_verbose())
+    g_print ("string2 length = %lu...\n", (gulong)string2->len);
   string2->str[70] = '\0';
-  g_print ("first 70 chars:\n%s\n", string2->str);
+  if (g_test_verbose())
+    g_print ("first 70 chars:\n%s\n", string2->str);
   string2->str[141] = '\0';
-  g_print ("next 70 chars:\n%s\n", string2->str+71);
+  if (g_test_verbose())
+    g_print ("next 70 chars:\n%s\n", string2->str+71);
   string2->str[212] = '\0';
-  g_print ("and next 70:\n%s\n", string2->str+142);
-  g_print ("last 70 chars:\n%s\n", string2->str+string2->len - 70);
+  if (g_test_verbose())
+    g_print ("and next 70:\n%s\n", string2->str+142);
+  if (g_test_verbose())
+    g_print ("last 70 chars:\n%s\n", string2->str+string2->len - 70);
 
   g_string_free (string1, TRUE);
   g_string_free (string2, TRUE);
@@ -1031,12 +1271,11 @@ main (int   argc,
   g_string_free (string1, TRUE);
 
   /* append_len */
-
   string1 = g_string_new ("firsthalf");
   g_string_append_len (string1, "lasthalfjunkjunk", strlen ("lasthalf"));
   g_assert (strcmp (string1->str, "firsthalflasthalf") == 0);
-  g_string_free (string1, TRUE);  
-  
+  g_string_free (string1, TRUE);
+
   /* prepend */
   string1 = g_string_new ("lasthalf");
   g_string_prepend (string1, "firsthalf");
@@ -1048,7 +1287,7 @@ main (int   argc,
   g_string_prepend_len (string1, "firsthalfjunkjunk", strlen ("firsthalf"));
   g_assert (strcmp (string1->str, "firsthalflasthalf") == 0);
   g_string_free (string1, TRUE);
-  
+
   /* insert */
   string1 = g_string_new ("firstlast");
   g_string_insert (string1, 5, "middle");
@@ -1060,9 +1299,8 @@ main (int   argc,
   g_string_insert (string1, strlen ("firstmiddle"), "last");
   g_assert (strcmp (string1->str, "firstmiddlelast") == 0);
   g_string_free (string1, TRUE);
-  
-  /* insert_len */
 
+  /* insert_len */
   string1 = g_string_new ("firstlast");
   g_string_insert_len (string1, 5, "middlejunkjunk", strlen ("middle"));
   g_assert (strcmp (string1->str, "firstmiddlelast") == 0);
@@ -1073,14 +1311,12 @@ main (int   argc,
   g_string_insert_len (string1, -1, "lastjunkjunk", strlen ("last"));
   g_assert (strcmp (string1->str, "firstlast") == 0);
   g_string_free (string1, TRUE);
-  
+
   /* insert_len with magic -1 len for strlen-the-string */
   string1 = g_string_new ("first");
   g_string_insert_len (string1, 5, "last", -1);
   g_assert (strcmp (string1->str, "firstlast") == 0);
   g_string_free (string1, TRUE);
-  
-  g_print ("ok\n");
 
   /* g_string_equal */
   string1 = g_string_new ("test");
@@ -1090,8 +1326,10 @@ main (int   argc,
   g_assert (g_string_equal(string1, string2));
   g_string_free (string1, TRUE);
   g_string_free (string2, TRUE);
-  
+
   /* Check handling of embedded ASCII 0 (NUL) characters in GString. */
+  if (g_test_verbose())
+    g_print ("test embedded ASCII 0 (NUL) characters in GString\n");
   string1 = g_string_new ("fiddle");
   string2 = g_string_new ("fiddle");
   g_assert (g_string_equal(string1, string2));
@@ -1110,114 +1348,77 @@ main (int   argc,
   g_assert ( memcmp(string1->str, "fQEDiddle\0xyzzy", 16) == 0);
   g_string_free (string1, TRUE);
   g_string_free (string2, TRUE);
-  
-  g_print ("test positional printf formats (not supported): ");
+}
+
+static void
+various_string_tests (void)
+{
+  GStringChunk *string_chunk;
+  GTimeVal ref_date, date;
+  gchar *tmp_string = NULL, *tmp_string_2, *string, *date_str;
+  guint i;
+
+  if (g_test_verbose())
+    g_print ("checking string chunks...");
+  string_chunk = g_string_chunk_new (1024);
+  for (i = 0; i < 100000; i ++)
+    {
+      tmp_string = g_string_chunk_insert (string_chunk, "hi pete");
+      if (strcmp ("hi pete", tmp_string) != 0)
+	g_error ("string chunks are broken.\n");
+    }
+  tmp_string_2 = g_string_chunk_insert_const (string_chunk, tmp_string);
+  g_assert (tmp_string_2 != tmp_string && strcmp (tmp_string_2, tmp_string) == 0);
+  tmp_string = g_string_chunk_insert_const (string_chunk, tmp_string);
+  g_assert (tmp_string_2 == tmp_string);
+  g_string_chunk_free (string_chunk);
+
+  if (g_test_verbose())
+    g_print ("test positional printf formats (not supported):");
   string = g_strdup_printf ("%.*s%s", 5, "a", "b");
   tmp_string = g_strdup_printf ("%2$*1$s", 5, "c");
-  g_print ("%s%s\n", string, tmp_string);
+  if (g_test_verbose())
+    g_print ("%s%s\n", string, tmp_string);
   g_free (tmp_string);
   g_free (string);
 
-  g_print ("checking timers...\n");
-  
-  timer = g_timer_new ();
-  g_print ("  spinning for 3 seconds...\n");
-
-  g_timer_start (timer);
-  while (g_timer_elapsed (timer, NULL) < 3)
-    ;
-
-  g_timer_stop (timer);
-  g_timer_destroy (timer);
-
-  g_print ("ok\n");
-
-  g_print ("checking g_timer_continue...\n");
-
-  timer2 = g_timer_new ();
-
-  g_print ("\trun for 1 second...\n");
-  timer = g_timer_new();
-  g_usleep(G_USEC_PER_SEC); /* run timer for 1 second */
-  g_timer_stop(timer);
-
-  g_print ("\tstop for 1 second...\n");
-  g_usleep(G_USEC_PER_SEC); /* wait for 1 second */
-  g_print ("\trun for 2 seconds...\n");
-
-  g_timer_continue(timer);
-  g_usleep(2*G_USEC_PER_SEC); /* run timer for 2 seconds */
-  g_timer_stop(timer);
-
-  g_print ("\tstop for 1.5 seconds...\n");
-  g_usleep((3*G_USEC_PER_SEC)/2); /* wait for 1.5 seconds */
-  g_print ("\trun for 0.2 seconds...\n");
-
-  g_timer_continue(timer);
-  g_usleep(G_USEC_PER_SEC/5); /* run timer for 0.2 seconds */
-  g_timer_stop(timer);
-
-  g_print ("\tstop for 4 seconds...\n");
-  g_usleep(4*G_USEC_PER_SEC); /* wait for 4 seconds */
-  g_print ("\trun for 5.8 seconds...\n");
-
-  g_timer_continue(timer);
-  g_usleep((29*G_USEC_PER_SEC)/5); /* run timer for 5.8 seconds */
-  g_timer_stop(timer);
-
-  elapsed = g_timer_elapsed (timer, &elapsed_usecs);
-  g_print ("\t=> timer = %.6f = %d.%06ld (should be: 9.000000) (%.6f off)\n", elapsed, (int) elapsed, elapsed_usecs, ABS (elapsed - 9.));
-
-  if (elapsed > 8.8 && elapsed < 9.2)
-    g_print ("g_timer_continue ... ok\n\n");
-  else
-    g_print ("g_timer_continue ... ***** FAILED *****\n\n");
-
-  g_timer_stop(timer2);
-
-  elapsed = g_timer_elapsed(timer2, &elapsed_usecs);
-  g_print ("\t=> timer2 = %.6f = %d.%06ld (should be: %.6f) (%.6f off)\n\n", elapsed, (int) elapsed, elapsed_usecs, 9.+6.5, ABS (elapsed - (9.+6.5)));
-
-  if (elapsed > (8.8+6.5) && elapsed < (9.2+6.5))
-    g_print ("timer2 ... ok\n\n");
-  else
-    g_print ("timer2 ... ***** FAILED *****\n\n");
-
-  g_timer_destroy(timer);
-  g_timer_destroy(timer2);
-
 #define REF_SEC_UTC  320063760
 #define REF_STR_UTC  "1980-02-22T10:36:00Z"
 #define REF_STR_CEST "1980-02-22T12:36:00+02:00"
 #define REF_STR_EST  "1980-02-22T05:36:00-05:00"
 
-  g_print ("checking g_time_val_from_iso8601...\n");
+  if (g_test_verbose())
+    g_print ("checking g_time_val_from_iso8601...\n");
   ref_date.tv_sec = REF_SEC_UTC;
   ref_date.tv_usec = 0;
   g_assert (g_time_val_from_iso8601 (REF_STR_UTC, &date) != FALSE);
-  g_print ("\t=> UTC stamp = %ld (should be: %ld) (%ld off)\n", date.tv_sec, ref_date.tv_sec, date.tv_sec - ref_date.tv_sec);
+  if (g_test_verbose())
+    g_print ("\t=> UTC stamp = %ld (should be: %ld) (%ld off)\n", date.tv_sec, ref_date.tv_sec, date.tv_sec - ref_date.tv_sec);
   g_assert (date.tv_sec == ref_date.tv_sec);
 
   g_assert (g_time_val_from_iso8601 (REF_STR_CEST, &date) != FALSE);
-  g_print ("\t=> CEST stamp = %ld (should be: %ld) (%ld off)\n", date.tv_sec, ref_date.tv_sec, date.tv_sec - ref_date.tv_sec);
+  if (g_test_verbose())
+    g_print ("\t=> CEST stamp = %ld (should be: %ld) (%ld off)\n", date.tv_sec, ref_date.tv_sec, date.tv_sec - ref_date.tv_sec);
   g_assert (date.tv_sec == ref_date.tv_sec);
-  
+
   g_assert (g_time_val_from_iso8601 (REF_STR_EST, &date) != FALSE);
-  g_print ("\t=> EST stamp = %ld (should be: %ld) (%ld off)\n", date.tv_sec, ref_date.tv_sec, date.tv_sec - ref_date.tv_sec);
+  if (g_test_verbose())
+    g_print ("\t=> EST stamp = %ld (should be: %ld) (%ld off)\n", date.tv_sec, ref_date.tv_sec, date.tv_sec - ref_date.tv_sec);
   g_assert (date.tv_sec == ref_date.tv_sec);
-  g_print ("ok\n");
-  
-  g_print ("checking g_time_val_to_iso8601...\n");
+
+  if (g_test_verbose())
+    g_print ("checking g_time_val_to_iso8601...\n");
   ref_date.tv_sec = REF_SEC_UTC;
   ref_date.tv_usec = 1;
   date_str = g_time_val_to_iso8601 (&ref_date);
   g_assert (date_str != NULL);
-  g_print ("\t=> date string = %s (should be: %s)\n", date_str, REF_STR_UTC);
+  if (g_test_verbose())
+    g_print ("\t=> date string = %s (should be: %s)\n", date_str, REF_STR_UTC);
   g_assert (strcmp (date_str, REF_STR_UTC) == 0);
   g_free (date_str);
-  g_print ("ok\n");
 
-  g_print ("checking g_ascii_strcasecmp...");
+  if (g_test_verbose())
+    g_print ("checking g_ascii_strcasecmp...");
   g_assert (g_ascii_strcasecmp ("FroboZZ", "frobozz") == 0);
   g_assert (g_ascii_strcasecmp ("frobozz", "frobozz") == 0);
   g_assert (g_ascii_strcasecmp ("frobozz", "FROBOZZ") == 0);
@@ -1233,32 +1434,29 @@ main (int   argc,
   g_assert (g_ascii_strcasecmp ("B", "a") > 0);
   g_assert (g_ascii_strcasecmp ("B", "A") > 0);
 
-  g_print ("ok\n");
-
-  g_print ("checking g_strdup...");
-  g_assert(g_strdup(NULL) == NULL);
-  string = g_strdup(GLIB_TEST_STRING);
-  g_assert(string != NULL);
-  g_assert(strcmp(string, GLIB_TEST_STRING) == 0);
-  g_free(string);
-
-  g_print ("ok\n");
+  if (g_test_verbose())
+    g_print ("checking g_strdup...\n");
+  g_assert (g_strdup (NULL) == NULL);
+  string = g_strdup (GLIB_TEST_STRING);
+  g_assert (string != NULL);
+  g_assert (strcmp(string, GLIB_TEST_STRING) == 0);
+  g_free (string);
 
-  g_print ("checking g_strconcat...");
-  string = g_strconcat(GLIB_TEST_STRING, NULL);
-  g_assert(string != NULL);
-  g_assert(strcmp(string, GLIB_TEST_STRING) == 0);
-  g_free(string);
-  string = g_strconcat(GLIB_TEST_STRING, GLIB_TEST_STRING, 
-  		       GLIB_TEST_STRING, NULL);
-  g_assert(string != NULL);
-  g_assert(strcmp(string, GLIB_TEST_STRING GLIB_TEST_STRING
-  			  GLIB_TEST_STRING) == 0);
-  g_free(string);
-  g_print ("ok\n");
-  
+  if (g_test_verbose())
+    g_print ("checking g_strconcat...\n");
+  string = g_strconcat (GLIB_TEST_STRING, NULL);
+  g_assert (string != NULL);
+  g_assert (strcmp (string, GLIB_TEST_STRING) == 0);
+  g_free (string);
+  string = g_strconcat (GLIB_TEST_STRING, GLIB_TEST_STRING, 
+                        GLIB_TEST_STRING, NULL);
+  g_assert (string != NULL);
+  g_assert (strcmp (string, GLIB_TEST_STRING GLIB_TEST_STRING
+                    GLIB_TEST_STRING) == 0);
+  g_free (string);
 
-  g_print("checking g_strlcpy/g_strlcat...");
+  if (g_test_verbose())
+    g_print ("checking g_strlcpy/g_strlcat...");
   /* The following is a torture test for strlcpy/strlcat, with lots of
    * checking; normal users wouldn't use them this way!
    */
@@ -1304,7 +1502,7 @@ main (int   argc,
   *(string + 1)= '\0';
   g_assert (g_strlcat(string, "123" , 0) == 3);
   g_assert (*string == 'Y');
-  
+
   /* A few more tests, demonstrating more "normal" use  */
   g_assert (g_strlcpy(string, "hi", 5) == 2);
   g_assert (g_str_equal(string, "hi"));
@@ -1312,251 +1510,57 @@ main (int   argc,
   g_assert (g_str_equal(string, "hit"));
   g_free(string);
 
-  g_print ("ok\n");
-  
-  
-  g_print ("checking g_strdup_printf...");
+  if (g_test_verbose())
+    g_print ("checking g_strdup_printf...\n");
   string = g_strdup_printf ("%05d %-5s", 21, "test");
   g_assert (string != NULL);
   g_assert (strcmp(string, "00021 test ") == 0);
   g_free (string);
 
-  g_print ("ok\n");
-
   /* g_debug (argv[0]); */
+}
 
-  /* Relation tests */
-
-  g_print ("checking relations...");
-
-  relation = g_relation_new (2);
-
-  g_relation_index (relation, 0, g_int_hash, g_int_equal);
-  g_relation_index (relation, 1, g_int_hash, g_int_equal);
-
-  for (i = 0; i < 1024; i += 1)
-    data[i] = i;
-
-  for (i = 1; i < 1023; i += 1)
-    {
-      g_relation_insert (relation, data + i, data + i + 1);
-      g_relation_insert (relation, data + i, data + i - 1);
-    }
-
-  for (i = 2; i < 1022; i += 1)
-    {
-      g_assert (! g_relation_exists (relation, data + i, data + i));
-      g_assert (! g_relation_exists (relation, data + i, data + i + 2));
-      g_assert (! g_relation_exists (relation, data + i, data + i - 2));
-    }
-
-  for (i = 1; i < 1023; i += 1)
-    {
-      g_assert (g_relation_exists (relation, data + i, data + i + 1));
-      g_assert (g_relation_exists (relation, data + i, data + i - 1));
-    }
-
-  for (i = 2; i < 1022; i += 1)
-    {
-      g_assert (g_relation_count (relation, data + i, 0) == 2);
-      g_assert (g_relation_count (relation, data + i, 1) == 2);
-    }
-
-  g_assert (g_relation_count (relation, data, 0) == 0);
-
-  g_assert (g_relation_count (relation, data + 42, 0) == 2);
-  g_assert (g_relation_count (relation, data + 43, 1) == 2);
-  g_assert (g_relation_count (relation, data + 41, 1) == 2);
-  g_relation_delete (relation, data + 42, 0);
-  g_assert (g_relation_count (relation, data + 42, 0) == 0);
-  g_assert (g_relation_count (relation, data + 43, 1) == 1);
-  g_assert (g_relation_count (relation, data + 41, 1) == 1);
-
-  tuples = g_relation_select (relation, data + 200, 0);
-
-  g_assert (tuples->len == 2);
-
-#if 0
-  for (i = 0; i < tuples->len; i += 1)
-    {
-      printf ("%d %d\n",
-	      *(gint*) g_tuples_index (tuples, i, 0),
-	      *(gint*) g_tuples_index (tuples, i, 1));
-    }
-#endif
-
-  g_assert (g_relation_exists (relation, data + 300, data + 301));
-  g_relation_delete (relation, data + 300, 0);
-  g_assert (!g_relation_exists (relation, data + 300, data + 301));
-
-  g_tuples_destroy (tuples);
-
-  g_relation_destroy (relation);
-
-  relation = NULL;
-
-  g_print ("ok\n");
-
-  g_print ("checking pointer arrays...");
-
-  gparray = g_ptr_array_new ();
-  for (i = 0; i < 10000; i++)
-    g_ptr_array_add (gparray, GINT_TO_POINTER (i));
-
-  for (i = 0; i < 10000; i++)
-    if (g_ptr_array_index (gparray, i) != GINT_TO_POINTER (i))
-      g_print ("array fails: %p ( %p )\n", g_ptr_array_index (gparray, i), GINT_TO_POINTER (i));
-
-  g_ptr_array_free (gparray, TRUE);
-
-  g_print ("ok\n");
-
-
-  g_print ("checking byte arrays...");
-
-  gbarray = g_byte_array_new ();
-  for (i = 0; i < 10000; i++)
-    g_byte_array_append (gbarray, (guint8*) "abcd", 4);
-
+static void
+test_mem_chunks (void)
+{
+  GMemChunk *mem_chunk = g_mem_chunk_new ("test mem chunk", 50, 100, G_ALLOC_AND_FREE);
+  gchar *mem[10000];
+  guint i;
   for (i = 0; i < 10000; i++)
     {
-      g_assert (gbarray->data[4*i] == 'a');
-      g_assert (gbarray->data[4*i+1] == 'b');
-      g_assert (gbarray->data[4*i+2] == 'c');
-      g_assert (gbarray->data[4*i+3] == 'd');
+      guint j;
+      mem[i] = g_chunk_new (gchar, mem_chunk);
+      for (j = 0; j < 50; j++)
+	mem[i][j] = i * j;
     }
-
-  g_byte_array_free (gbarray, TRUE);
-  g_print ("ok\n");
-
-  g_printerr ("g_log tests:");
-  g_warning ("harmless warning with parameters: %d %s %#x", 42, "Boo", 12345);
-  g_message ("the next warning is a test:");
-  string = NULL;
-  g_print (string);
-  g_message ("non-printable UTF-8: \"\xc3\xa4\xda\x85\"");
-  g_message ("unsafe chars: \"\x10\x11\x12\n\t\x7f\x81\x82\x83\"");
-
-  g_print ("checking endian macros (host is ");
-#if G_BYTE_ORDER == G_BIG_ENDIAN
-  g_print ("big endian)...");
-#else
-  g_print ("little endian)...");
-#endif
-  g_assert (GUINT16_SWAP_LE_BE (gu16t1) == gu16t2);  
-  g_assert (GUINT32_SWAP_LE_BE (gu32t1) == gu32t2);  
-  g_assert (GUINT64_SWAP_LE_BE (gu64t1) == gu64t2);  
-
-  g_print ("ok\n");
-
-  if (g_get_charset ((G_CONST_RETURN char**)&charset))
-    g_print ("current charset is UTF-8: %s\n", charset);
-  else
-    g_print ("current charset is not UTF-8: %s\n", charset);
-
-#ifdef G_PLATFORM_WIN32
-  g_print ("current locale: %s\n", g_win32_getlocale ());
-  g_print ("GLib DLL name tested for: %s\n", glib_dll);
-
-  g_print ("GLib installation directory, from Registry entry for %s if available: %s\n",
-	   GETTEXT_PACKAGE,
-	   g_win32_get_package_installation_directory (GETTEXT_PACKAGE, NULL));
-  g_print ("Ditto, or from GLib DLL name: %s\n",
-	   g_win32_get_package_installation_directory (GETTEXT_PACKAGE, glib_dll));
-  g_print ("Ditto, only from GLib DLL name: %s\n",
-	   g_win32_get_package_installation_directory (NULL, glib_dll));
-  g_print ("locale subdirectory of GLib installation directory: %s\n",
-	   g_win32_get_package_installation_subdirectory (NULL, glib_dll, "lib\\locale"));
-  g_print ("GTK+ 2.0 installation directory, if available: %s\n",
-	   g_win32_get_package_installation_directory ("gtk20", NULL));
-
-  g_print ("found more.com as %s\n", g_find_program_in_path ("more.com"));
-  g_print ("found regedit as %s\n", g_find_program_in_path ("regedit"));
-
-  g_print ("a Win32 error message: %s\n", g_win32_error_message (2));
-
-#endif
-
-  g_print ("checking file functions...\n");
-
-  strcpy (template, "foobar");
-  fd = g_mkstemp (template);
-  if (fd != -1)
-    g_print ("g_mkstemp works even if template doesn't end in XXXXXX\n");
-  close (fd);
-  strcpy (template, "fooXXXXXX");
-  fd = g_mkstemp (template);
-  if (fd == -1)
-    g_print ("g_mkstemp didn't work for template %s\n", template);
-  i = write (fd, hello, hellolen);
-  if (i == -1)
-    g_print ("write() failed: %s\n", g_strerror (errno));
-  else if (i != hellolen)
-    g_print ("write() should have written %d bytes, wrote %d\n", hellolen, i);
-
-  lseek (fd, 0, 0);
-  i = read (fd, chars, sizeof (chars));
-  if (i == -1)
-    g_print ("read() failed: %s\n", g_strerror (errno));
-  else if (i != hellolen)
-    g_print ("read() should have read %d bytes, got %d\n", hellolen, i);
-
-  chars[i] = 0;
-  if (strcmp (chars, hello) != 0)
-    g_print ("wrote '%s', but got '%s'\n", hello, chars);
-
-  close (fd);
-  remove (template);
-
-  error = NULL;
-  strcpy (template, "zap" G_DIR_SEPARATOR_S "barXXXXXX");
-  fd = g_file_open_tmp (template, &name_used, &error);
-  if (fd != -1)
-    g_print ("g_file_open_tmp works even if template contains '%s'\n",
-	     G_DIR_SEPARATOR_S);
-  else
-    g_print ("g_file_open_tmp correctly returns error: %s\n",
-	     error->message);
-  close (fd);
-  g_clear_error (&error);
-
-#ifdef G_OS_WIN32
-  strcpy (template, "zap/barXXXXXX");
-  fd = g_file_open_tmp (template, &name_used, &error);
-  if (fd != -1)
-    g_print ("g_file_open_tmp works even if template contains '/'\n");
-  else
-    g_print ("g_file_open_tmp correctly returns error: %s\n",
-	     error->message);
-  close (fd);
-  g_clear_error (&error);
-#endif
-
-  strcpy (template, "zapXXXXXX");
-  fd = g_file_open_tmp (template, &name_used, &error);
-  if (fd == -1)
-    g_print ("g_file_open_tmp didn't work for template '%s': %s\n",
-	     template, error->message);
-  else
-    g_print ("g_file_open_tmp for template '%s' used name '%s'\n",
-	     template, name_used);
-  close (fd);
-  g_clear_error (&error);
-  remove (name_used);
-
-  fd = g_file_open_tmp (NULL, &name_used, &error);
-  if (fd == -1)
-    g_print ("g_file_open_tmp didn't work for a NULL template: %s\n",
-	     error->message);
-  else
-    g_print ("g_file_open_tmp for NULL template used name '%s'\n",
-	     name_used);
-  close (fd);
-  g_clear_error (&error);
-  remove (name_used);
-
-  test_g_parse_debug_string ();
-
-  return 0;
+  for (i = 0; i < 10000; i++)
+    g_mem_chunk_free (mem_chunk, mem[i]);
 }
 
+int
+main (int   argc,
+      char *argv[])
+{
+  g_test_init (&argc, &argv, NULL);
+
+  g_test_add_func ("/testglib/Infos", test_info);
+  g_test_add_func ("/testglib/Types Sizes", type_sizes);
+  g_test_add_func ("/testglib/GStrings", gstring_tests);
+  g_test_add_func ("/testglib/Various Strings", various_string_tests);
+  g_test_add_func ("/testglib/GList", glist_test);
+  g_test_add_func ("/testglib/GSList", gslist_test);
+  g_test_add_func ("/testglib/GNode", gnode_test);
+  g_test_add_func ("/testglib/GTree", binary_tree_test);
+  g_test_add_func ("/testglib/Arrays", test_arrays);
+  g_test_add_func ("/testglib/GHashTable", hash_table_tests);
+  g_test_add_func ("/testglib/Relation", relation_test);
+  g_test_add_func ("/testglib/File Paths", test_paths);
+  g_test_add_func ("/testglib/File Functions", test_file_functions);
+  g_test_add_func ("/testglib/Mkdir", test_g_mkdir_with_parents);
+  g_test_add_func ("/testglib/Parse Debug Strings", test_g_parse_debug_string);
+  g_test_add_func ("/testglib/GMemChunk (deprecated)", test_mem_chunks);
+  g_test_add_func ("/testglib/Warnings & Errors", log_warning_error_tests);
+  g_test_add_func ("/testglib/Timers (slow)", timer_tests);
+
+  return g_test_run();
+}