scan-test: Print nonintegers with limited precision to avoid test failures.

Cygwin printed 0.1 as 0.10000000000000001, even with dtoastr().

Reported by Przemek Powalko <pp.alter.ego@gmail.com>.

diff --git a/tests/language/lexer/scan-test.c b/tests/language/lexer/scan-test.c
index 84eff8171f9520d7a80657ac0155470812fcefb2..cfa8a79938f859b832e53b2cd6c01af703671170 100644 (file)
--- a/tests/language/lexer/scan-test.c
+++ b/tests/language/lexer/scan-test.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2010, 2011, 2013 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
@@ -77,10 +77,12 @@ main (int argc, char *argv[])
       printf ("%s", scan_type_to_string (token.type));
       if (token.number != 0.0)
         {
-          char s[DBL_BUFSIZE_BOUND];
+          double x = token.number;
 
-          dtoastr (s, sizeof s, 0, 0, token.number);
-          printf (" %s", s);
+          if (x > LONG_MIN && x <= LONG_MAX && floor (x) == x)
+            printf (" %ld", (long int) x);
+          else
+            printf (" %.3g", x);
         }
       if (token.string.string != NULL || token.string.length > 0)
         printf (" \"%.*s\"", (int) token.string.length, token.string.string);