X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-fstrcmp.c;h=3cf24fb3b376f30b454f8d4ee2265d373167efa7;hb=75ce01c4382e5acf45599baaade587f78ddfa956;hp=5aa36ff8b4abf9cf5c6e9b64cf7132bc7424ac80;hpb=a669764b7e8277a9877b9a22024bf800540321a3;p=gnulib.git
diff --git a/tests/test-fstrcmp.c b/tests/test-fstrcmp.c
index 5aa36ff8b..3cf24fb3b 100644
--- a/tests/test-fstrcmp.c
+++ b/tests/test-fstrcmp.c
@@ -1,10 +1,10 @@
/* Test of fuzzy string comparison.
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007-2010 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ 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
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,8 +12,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
/* Written by Bruno Haible , 2007. */
@@ -22,19 +21,9 @@
#include "fstrcmp.h"
#include
-#include
-#include
-
-#define ASSERT(expr) \
- do \
- { \
- if (!(expr)) \
- { \
- fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
- abort (); \
- } \
- } \
- while (0)
+
+#include "progname.h"
+#include "macros.h"
static bool
check_fstrcmp (const char *string1, const char *string2, double expected)
@@ -45,13 +34,40 @@ check_fstrcmp (const char *string1, const char *string2, double expected)
compliant by default, to avoid that msgmerge results become platform and
compiler option dependent. 'volatile' is a portable alternative to gcc's
-ffloat-store option. */
- volatile double result = fstrcmp (string1, string2);
- return (result == expected);
+ {
+ volatile double result = fstrcmp (string1, string2);
+ if (!(result == expected))
+ return false;
+ }
+ {
+ volatile double result = fstrcmp_bounded (string1, string2, expected);
+ if (!(result == expected))
+ return false;
+ }
+ {
+ double bound = expected * 0.5; /* implies bound <= expected */
+ volatile double result = fstrcmp_bounded (string1, string2, bound);
+ if (!(result == expected))
+ return false;
+ }
+ {
+ double bound = (1 + expected) * 0.5;
+ if (expected < bound)
+ {
+ volatile double result = fstrcmp_bounded (string1, string2, bound);
+ if (!(result < bound))
+ return false;
+ }
+ }
+
+ return true;
}
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.));