X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-array_oset.c;h=1892032f1a57cff44578821538dbd51097dcfa64;hb=e7086a9a301ffcfef17edbcba9e7c0312c33f7a8;hp=20025305c696d02b52ede05eed2c349485e16461;hpb=8fe59d16da6be1fbd1a3a9e507d620bd381b00da;p=gnulib.git

diff --git a/tests/test-array_oset.c b/tests/test-array_oset.c
index 20025305c..1892032f1 100644
--- a/tests/test-array_oset.c
+++ b/tests/test-array_oset.c
@@ -1,5 +1,5 @@
 /* Test of ordered set data type implementation.
-   Copyright (C) 2006-2009 Free Software Foundation, Inc.
+   Copyright (C) 2006-2013 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software: you can redistribute it and/or modify
@@ -19,12 +19,13 @@
 
 #include "gl_array_oset.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "gl_xlist.h"
 #include "gl_array_list.h"
 #include "progname.h"
+#include "macros.h"
 
 static const char *objects[30] =
   {
@@ -32,18 +33,6 @@ static const char *objects[30] =
     "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "<", ">", "[", "]"
   };
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
 #define RANDOM(n) (rand () % (n))
 #define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))]