@@ -80,12 +80,12 @@ aux := init-misc
install-lib := libg.a
gpl2lgpl := error.c error.h
-tests := tst-dirname tst-tsearch tst-fdset tst-efgcvt tst-mntent tst-hsearch \
+tests := tst-dirname tst-tsearch tst-fdset tst-mntent tst-hsearch \
tst-error1 tst-pselect tst-insremque tst-mntent2 bug-hsearch1 \
tst-mntent-blank-corrupt tst-mntent-blank-passno bug18240 \
tst-preadvwritev tst-preadvwritev64 tst-makedev tst-empty \
tst-preadvwritev2 tst-preadvwritev64v2 tst-warn-wide \
- tst-ldbl-warn tst-ldbl-error
+ tst-ldbl-warn tst-ldbl-error tst-dbl-efgcvt tst-ldbl-efgcvt
# Tests which need libdl.
ifeq (yes,$(build-shared))
new file mode 100644
@@ -0,0 +1,37 @@
+/* Tests for *cvt function, double version.
+ Copyright (C) 1998-2018 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#include <float.h>
+
+#define ECVT ecvt
+#define FCVT fcvt
+#define ECVT_R ecvt_r
+#define FCVT_R fcvt_r
+#define FLOAT double
+#define NAME(x) #x
+#define PRINTF_CONVERSION "%f"
+
+#if DBL_MANT_DIG == 53
+# define EXTRA_ECVT_TESTS \
+ { 0x1p-1074, 3, -323, "494" }, \
+ { -0x1p-1074, 3, -323, "494" },
+#else
+# define EXTRA_ECVT_TESTS
+#endif
+
+#include <tst-efgcvt-template.c>
similarity index 78%
rename from misc/tst-efgcvt.c
rename to misc/tst-efgcvt-template.c
@@ -19,7 +19,6 @@
# define _GNU_SOURCE 1
#endif
-#include <float.h>
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
@@ -29,15 +28,15 @@
typedef struct
{
- double value;
+ FLOAT value;
int ndigit;
int decpt;
char result[30];
} testcase;
-typedef char * ((*efcvt_func) (double, int, int *, int *));
+typedef char * ((*efcvt_func) (FLOAT, int, int *, int *));
-typedef int ((*efcvt_r_func) (double, int, int *, int *, char *, size_t));
+typedef int ((*efcvt_r_func) (FLOAT, int, int *, int *, char *, size_t));
static testcase ecvt_tests[] =
@@ -59,10 +58,7 @@ static testcase ecvt_tests[] =
{ 123.01, -4, 3, "" },
{ 126.71, -4, 3, "" },
{ 0.0, 4, 1, "0000" },
-#if DBL_MANT_DIG == 53
- { 0x1p-1074, 3, -323, "494" },
- { -0x1p-1074, 3, -323, "494" },
-#endif
+ EXTRA_ECVT_TESTS
/* -1.0 is end marker. */
{ -1.0, 0, 0, "" }
};
@@ -91,11 +87,12 @@ static testcase fcvt_tests[] =
};
static void
-output_error (const char *name, double value, int ndigit,
+output_error (const char *name, FLOAT value, int ndigit,
const char *exp_p, int exp_decpt, int exp_sign,
char *res_p, int res_decpt, int res_sign)
{
- printf ("%s returned wrong result for value: %f, ndigits: %d\n",
+ printf ("%s returned wrong result for value: " PRINTF_CONVERSION
+ ", ndigits: %d\n",
name, value, ndigit);
printf ("Result was p: \"%s\", decpt: %d, sign: %d\n",
res_p, res_decpt, res_sign);
@@ -106,11 +103,12 @@ output_error (const char *name, double value, int ndigit,
static void
-output_r_error (const char *name, double value, int ndigit,
+output_r_error (const char *name, FLOAT value, int ndigit,
const char *exp_p, int exp_decpt, int exp_sign, int exp_return,
char *res_p, int res_decpt, int res_sign, int res_return)
{
- printf ("%s returned wrong result for value: %f, ndigits: %d\n",
+ printf ("%s returned wrong result for value: " PRINTF_CONVERSION
+ ", ndigits: %d\n",
name, value, ndigit);
printf ("Result was buf: \"%s\", decpt: %d, sign: %d return value: %d\n",
res_p, res_decpt, res_sign, res_return);
@@ -171,30 +169,30 @@ special (void)
char *p;
char buf [1024];
- p = ecvt (NAN, 10, &decpt, &sign);
+ p = ECVT (NAN, 10, &decpt, &sign);
if (sign != 0 || strcmp (p, "nan") != 0)
- output_error ("ecvt", NAN, 10, "nan", 0, 0, p, decpt, sign);
+ output_error (NAME (ecvt), NAN, 10, "nan", 0, 0, p, decpt, sign);
- p = ecvt (INFINITY, 10, &decpt, &sign);
+ p = ECVT (INFINITY, 10, &decpt, &sign);
if (sign != 0 || strcmp (p, "inf") != 0)
- output_error ("ecvt", INFINITY, 10, "inf", 0, 0, p, decpt, sign);
+ output_error (NAME (ecvt), INFINITY, 10, "inf", 0, 0, p, decpt, sign);
/* Simply make sure these calls with large NDIGITs don't crash. */
- (void) ecvt (123.456, 10000, &decpt, &sign);
- (void) fcvt (123.456, 10000, &decpt, &sign);
+ (void) ECVT (123.456, 10000, &decpt, &sign);
+ (void) FCVT (123.456, 10000, &decpt, &sign);
/* Some tests for the reentrant functions. */
/* Use a too small buffer. */
- res = ecvt_r (123.456, 10, &decpt, &sign, buf, 1);
+ res = ECVT_R (123.456, 10, &decpt, &sign, buf, 1);
if (res == 0)
{
- printf ("ecvt_r with a too small buffer was succesful.\n");
+ printf (NAME (ecvt_r) " with a too small buffer was succesful.\n");
support_record_failure ();
}
- res = fcvt_r (123.456, 10, &decpt, &sign, buf, 1);
+ res = FCVT_R (123.456, 10, &decpt, &sign, buf, 1);
if (res == 0)
{
- printf ("fcvt_r with a too small buffer was succesful.\n");
+ printf (NAME (fcvt_r) " with a too small buffer was succesful.\n");
support_record_failure ();
}
}
@@ -203,10 +201,10 @@ special (void)
static int
do_test (void)
{
- test (ecvt_tests, ecvt, "ecvt");
- test (fcvt_tests, fcvt, "fcvt");
- test_r (ecvt_tests, ecvt_r, "ecvt_r");
- test_r (fcvt_tests, fcvt_r, "fcvt_r");
+ test (ecvt_tests, ECVT, NAME (ecvt));
+ test (fcvt_tests, FCVT, NAME (fcvt));
+ test_r (ecvt_tests, ECVT_R, NAME (ecvt_r));
+ test_r (fcvt_tests, FCVT_R, NAME (fcvt_r));
special ();
return 0;
new file mode 100644
@@ -0,0 +1,30 @@
+/* Tests for *cvt function, long double version.
+ Copyright (C) 1998-2018 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#define ECVT qecvt
+#define FCVT qfcvt
+#define ECVT_R qecvt_r
+#define FCVT_R qfcvt_r
+#define FLOAT long double
+#define NAME(x) NAMEX(q##x)
+#define NAMEX(x) #x
+#define PRINTF_CONVERSION "%Lf"
+
+#define EXTRA_ECVT_TESTS
+
+#include <tst-efgcvt-template.c>