X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-argv-iter.c;h=d0597bd5dc27183eb2b9182947e81e5f1b01c2f2;hb=e95ae6d7e8f2627cf450649daf30071f1971f404;hp=fffa425c7f63790bb855c3a9317473ff393849f8;hpb=3e2d7ac6c75ad7c92d25f59d11bd455d37ba4e37;p=gnulib.git

diff --git a/tests/test-argv-iter.c b/tests/test-argv-iter.c
index fffa425c7..d0597bd5d 100644
--- a/tests/test-argv-iter.c
+++ b/tests/test-argv-iter.c
@@ -1,5 +1,5 @@
 /* Test argv iterator
-   Copyright (C) 2008-2009 Free Software Foundation, Inc.
+   Copyright (C) 2008-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,23 +20,13 @@
 
 #include "argv-iter.h"
 
-#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
+#include "macros.h"
+
 #define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array))
-#define STREQ(s1, s2) (strcmp (s1, s2) == 0)
-#define ASSERT(expr) \
-  do                                                                         \
-    {                                                                        \
-      if (!(expr))                                                           \
-        {                                                                    \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                   \
-          abort ();                                                          \
-        }                                                                    \
-    }                                                                        \
-  while (0)
+#define STREQ(a, b) (strcmp (a, b) == 0)
 
 static FILE *
 write_nul_delimited_argv (char **argv)