X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-base64.c;h=c7cad2f7a4b96caf0a7c3542883e1853681c80bb;hb=4baa767de84048d693cb07d6d8a461b3343f1bb7;hp=48683259f1a0a45139b52c7b885420f4effc04e7;hpb=d1d75d5540bf75df8bc41c85b5a9fd111ca1f2dd;p=gnulib.git

diff --git a/tests/test-base64.c b/tests/test-base64.c
index 48683259f..c7cad2f7a 100644
--- a/tests/test-base64.c
+++ b/tests/test-base64.c
@@ -1,5 +1,5 @@
 /* Self tests for base64.
-   Copyright (C) 2004, 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2008-2011 Free Software Foundation, Inc.
    Written by Simon Josefsson.
 
    This program is free software: you can redistribute it and/or modify
@@ -17,27 +17,15 @@
 
 #include <config.h>
 
+#include "base64.h"
+
 #include <stddef.h>
-#include <stdio.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include <string.h>
 #include <stdint.h>
 
-#include "base64.h"
-
-#define ASSERT(expr)							\
-  do									\
-    {									\
-      if (!(expr))							\
-	{								\
-	  fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-	  fflush (stderr);						\
-	  abort ();							\
-	}								\
-    }									\
-  while (0)
+#include "macros.h"
 
 int
 main (void)
@@ -51,7 +39,7 @@ main (void)
 
   memset (out, 0x42, sizeof (out));
   base64_encode (in, 0, out, 0);
-  ASSERT(out[0] == '\x42');
+  ASSERT (out[0] == '\x42');
 
   memset (out, 0x42, sizeof (out));
   base64_encode (in, 1, out, 1);