2007-08-06 Simon Josefsson <simon@josefsson.org>

[gnulib.git] / tests / test-rbtree_list.c

diff --git a/tests/test-rbtree_list.c b/tests/test-rbtree_list.c
index 70af1a4..bb6c589 100644 (file)
--- a/tests/test-rbtree_list.c
+++ b/tests/test-rbtree_list.c
@@ -1,5 +1,5 @@
 /* Test of sequential list data type implementation.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software; you can redistribute it and/or modify
@@ -16,14 +16,15 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
+#include "gl_rbtree_list.h"
+
+#include <stdio.h>
 #include <stdlib.h>
 
 #include "gl_array_list.h"
-#include "gl_rbtree_list.h"
+#include "progname.h"
 
 extern void gl_rbtree_list_check_invariants (gl_list_t list);
 
@@ -33,7 +34,16 @@ static const char *objects[15] =
   };
 
 #define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(condition) if (!(condition)) abort ()
+#define ASSERT(expr) \
+  do                                                                        \
+    {                                                                       \
+      if (!(expr))                                                          \
+        {                                                                   \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();                                                         \
+        }                                                                   \
+    }                                                                       \
+  while (0)
 #define RANDOM(n) (rand () % (n))
 #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))]
 
@@ -64,6 +74,8 @@ main (int argc, char *argv[])
 {
   gl_list_t list1, list2, list3;
 
+  set_program_name (argv[0]);
+
   /* Allow the user to provide a non-default random seed on the command line.  */
   if (argc > 1)
     srand (atoi (argv[1]));
@@ -79,15 +91,15 @@ main (int argc, char *argv[])
       contents[i] = RANDOM_OBJECT ();
 
     /* Create list1.  */
-    list1 = gl_list_create (GL_ARRAY_LIST, NULL, NULL, true,
+    list1 = gl_list_create (GL_ARRAY_LIST, NULL, NULL, NULL, true,
                             initial_size, contents);
     /* Create list2.  */
-    list2 = gl_list_create_empty (GL_RBTREE_LIST, NULL, NULL, true);
+    list2 = gl_list_create_empty (GL_RBTREE_LIST, NULL, NULL, NULL, true);
     for (i = 0; i < initial_size; i++)
       gl_list_add_last (list2, contents[i]);
 
     /* Create list3.  */
-    list3 = gl_list_create (GL_RBTREE_LIST, NULL, NULL, true,
+    list3 = gl_list_create (GL_RBTREE_LIST, NULL, NULL, NULL, true,
                             initial_size, contents);
 
     check_all (list1, list2, list3);