X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Funiwbrk%2Ftest-u8-wordbreaks.c;h=b583539d22f276fdb755653a27ba5616778dc676;hb=200969d8ebed76c9b82837406a87cc767fafac1b;hp=c2633025b325a0ba8f66523610ecbccd2d870fcf;hpb=1b3657a57e4730d7ed08d78d67779f95e6b1dca3;p=gnulib.git

diff --git a/tests/uniwbrk/test-u8-wordbreaks.c b/tests/uniwbrk/test-u8-wordbreaks.c
index c2633025b..b583539d2 100644
--- a/tests/uniwbrk/test-u8-wordbreaks.c
+++ b/tests/uniwbrk/test-u8-wordbreaks.c
@@ -1,5 +1,5 @@
 /* Test of word breaks in UTF-8 strings.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 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,21 +20,9 @@
 
 #include "uniwbrk.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 
-#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)
+#include "macros.h"
 
 int
 main ()
@@ -53,16 +41,16 @@ main ()
 
     for (i = 0; i < 91; i++)
       {
-	ASSERT (p[i] == ((i >= 6 && i <= 7)
-			 || (i >= 11 && i <= 13)
-			 || (i >= 37 && i <= 44)
-			 || i == 46 || (i >= 50 && i <= 52)
-			 || (i >= 54 && i <= 55)
-			 || (i >= 58 && i <= 62) || (i >= 64 && i <= 67)
-			 || i == 70 || i == 73 || i == 76
-			 || i == 77 || i == 80 || i == 83
-			 || i == 84 || i == 90
-			 ? 1 : 0));
+        ASSERT (p[i] == ((i >= 6 && i <= 7)
+                         || (i >= 11 && i <= 13)
+                         || (i >= 37 && i <= 44)
+                         || i == 46 || (i >= 50 && i <= 52)
+                         || (i >= 54 && i <= 55)
+                         || (i >= 58 && i <= 62) || (i >= 64 && i <= 67)
+                         || i == 70 || i == 73 || i == 76
+                         || i == 77 || i == 80 || i == 83
+                         || i == 84 || i == 90
+                         ? 1 : 0));
       }
     free (p);
   }
@@ -79,16 +67,16 @@ main ()
 
     for (i = 0; i < 106; i++)
       {
-	ASSERT (p[i] == ((i >= 7 && i <= 8)
-			 || (i >= 12 && i <= 14)
-			 || (i >= 40 && i <= 47)
-			 || i == 49 || (i >= 53 && i <= 55)
-			 || (i >= 57 && i <= 58)
-			 || (i >= 61 && i <= 65) || (i >= 67 && i <= 70)
-			 || i == 73 || i == 76 || i == 79
-			 || i == 80 || i == 83 || i == 86
-			 || i == 87 || i == 105
-			 ? 1 : 0));
+        ASSERT (p[i] == ((i >= 7 && i <= 8)
+                         || (i >= 12 && i <= 14)
+                         || (i >= 40 && i <= 47)
+                         || i == 49 || (i >= 53 && i <= 55)
+                         || (i >= 57 && i <= 58)
+                         || (i >= 61 && i <= 65) || (i >= 67 && i <= 70)
+                         || i == 73 || i == 76 || i == 79
+                         || i == 80 || i == 83 || i == 86
+                         || i == 87 || i == 105
+                         ? 1 : 0));
       }
     free (p);
   }