X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-fstrcmp.c;h=3cf24fb3b376f30b454f8d4ee2265d373167efa7;hb=fe9ecba865a2015187a862f25ada175a5d3d8aa8;hp=b266b59460453489051c7f9be2c13855e9e29121;hpb=4facad5a3d557a73ea0bb1cf8b6e835163e1def1;p=gnulib.git diff --git a/tests/test-fstrcmp.c b/tests/test-fstrcmp.c index b266b5946..3cf24fb3b 100644 --- a/tests/test-fstrcmp.c +++ b/tests/test-fstrcmp.c @@ -1,5 +1,5 @@ /* Test of fuzzy string comparison. - Copyright (C) 2007-2008 Free Software Foundation, Inc. + Copyright (C) 2007-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 @@ -21,20 +21,9 @@ #include "fstrcmp.h" #include -#include -#include -#define ASSERT(expr) \ - do \ - { \ - if (!(expr)) \ - { \ - fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \ - fflush (stderr); \ - abort (); \ - } \ - } \ - while (0) +#include "progname.h" +#include "macros.h" static bool check_fstrcmp (const char *string1, const char *string2, double expected) @@ -65,9 +54,9 @@ check_fstrcmp (const char *string1, const char *string2, double expected) double bound = (1 + expected) * 0.5; if (expected < bound) { - volatile double result = fstrcmp_bounded (string1, string2, bound); - if (!(result < bound)) - return false; + volatile double result = fstrcmp_bounded (string1, string2, bound); + if (!(result < bound)) + return false; } } @@ -75,8 +64,10 @@ check_fstrcmp (const char *string1, const char *string2, double expected) } int -main () +main (int argc, char *argv[]) { + set_program_name (argv[0]); + ASSERT (check_fstrcmp ("Langstrumpf", "Langstrumpf", 1.0)); ASSERT (check_fstrcmp ("Levenshtein", "Levenstein", 20./21.)); ASSERT (check_fstrcmp ("Levenstein", "Levenshtein", 20./21.));