Merge tag 'branchpoint-5.1' into release

[disorder] / libtests / t-unicode.c

diff --git a/libtests/t-unicode.c b/libtests/t-unicode.c
index de04e477be014eb2b3e8a8d7fee930f763809ca0..2a199e35deaac777272194917290d40c63af2fec 100644 (file)
--- a/libtests/t-unicode.c
+++ b/libtests/t-unicode.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
 /*
  * This file is part of DisOrder.

- * Copyright (C) 2005, 2007, 2008 Richard Kettlewell
+ * Copyright (C) 2005, 2007-2009, 2011 Richard Kettlewell

  *
  * 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
  *
  * 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


@@ -30,13 +30,13 @@ static FILE *open_unicode_test(const char *path) {
     base = path;
   if(!(fp = fopen(base, "r"))) {
     snprintf(buffer, sizeof buffer,
     base = path;
   if(!(fp = fopen(base, "r"))) {
     snprintf(buffer, sizeof buffer,

-             "wget http://www.unicode.org/Public/5.1.0/ucd/%s", path);
+             "wget http://www.unicode.org/Public/6.0.0/ucd/%s", path);

     if((w = system(buffer)))
     if((w = system(buffer)))

-      fatal(0, "%s: %s", buffer, wstat(w));
+      disorder_fatal(0, "%s: %s", buffer, wstat(w));

     if(chmod(base, 0444) < 0)
     if(chmod(base, 0444) < 0)

-      fatal(errno, "chmod %s", base);
+      disorder_fatal(errno, "chmod %s", base);

     if(!(fp = fopen(base, "r")))
     if(!(fp = fopen(base, "r")))

-      fatal(errno, "%s", base);
+      disorder_fatal(errno, "%s", base);

   }
   return fp;
 }
   }
   return fp;
 }


@@ -79,7 +79,7 @@ static void breaktest(const char *path,
         buffer[bn++] = strtoul(lp, &lp, 16);
         continue;
       }
         buffer[bn++] = strtoul(lp, &lp, 16);
         continue;
       }

-      fatal(0, "%s:%d: evil line: %s", path, lineno, l);
+      disorder_fatal(0, "%s:%d: evil line: %s", path, lineno, l);

     }
     for(n = 0; n <= bn; ++n) {
       if(breakfn(buffer, bn, n) != break_allowed[n]) {
     }
     for(n = 0; n <= bn; ++n) {
       if(breakfn(buffer, bn, n) != break_allowed[n]) {