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

diff --git a/tests/test-array_oset.c b/tests/test-array_oset.c
index b28e3d219..a7d1f001d 100644
--- a/tests/test-array_oset.c
+++ b/tests/test-array_oset.c
@@ -22,6 +22,7 @@
 
 #include "gl_array_oset.h"
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -35,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))]
 
@@ -88,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);