X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-array_oset.c;h=a7d1f001da7689156d832b8d070442f9879fb695;hb=a7ebfd1caaa58b6a7bc0b1d1510b0255604e804a;hp=8e23eb1deb605388f1ac7a0291de4cc8211d322d;hpb=cac4431f72ec8226aa1badc4a357ad3e142049ad;p=gnulib.git

diff --git a/tests/test-array_oset.c b/tests/test-array_oset.c
index 8e23eb1de..a7d1f001d 100644
--- a/tests/test-array_oset.c
+++ b/tests/test-array_oset.c
@@ -22,10 +22,12 @@
 
 #include "gl_array_oset.h"
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "gl_array_list.h"
+#include "progname.h"
 
 static const char *objects[30] =
   {
@@ -34,7 +36,16 @@ static const char *objects[30] =
   };
 
 #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))]
 
@@ -75,6 +86,8 @@ main (int argc, char *argv[])
   gl_oset_t set1;
   gl_list_t set2;
 
+  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]));
@@ -85,10 +98,10 @@ main (int argc, char *argv[])
     unsigned int repeat;
 
     /* Create set1.  */
-    set1 = gl_oset_create_empty (GL_ARRAY_OSET, (gl_setelement_compar_fn) strcmp);
+    set1 = gl_oset_create_empty (GL_ARRAY_OSET, (gl_setelement_compar_fn) strcmp, NULL);
 
     /* Create set2.  */
-    set2 = gl_list_create_empty (GL_ARRAY_LIST, NULL, NULL, false);
+    set2 = gl_list_create_empty (GL_ARRAY_LIST, NULL, NULL, NULL, false);
 
     check_all (set1, set2);