2a30b8f4b2
Upstream commit: dcaf51b41e259387602774829c45222d0507f90a - elf: Change ldconfig auxcache magic number (bug 32231) - Make tst-strtod-underflow type-generic - Add crt1-2.0.o for glibc 2.0 compatibility tests - Add tests of more strtod special cases - Add more tests of strtod end pointer - Make tst-strtod2 and tst-strtod5 type-generic - powerpc64le: Build new strtod tests with long double ABI flags (bug 32145) - Do not set errno for overflowing NaN payload in strtod/nan (bug 32045) - Improve NaN payload testing - Make __strtod_internal tests type-generic - Fix strtod subnormal rounding (bug 30220) - More thoroughly test underflow / errno in tst-strtod-round - Test errno setting on strtod overflow in tst-strtod-round - Add tests of fread - stdio-common: Add new test for fdopen - libio: Attempt wide backup free only for non-legacy code - debug: Fix read error handling in pcprofiledump - elf: Fix tst-dlopen-tlsreinit1.out test dependency - elf: Avoid re-initializing already allocated TLS in dlopen (bug 31717) - elf: Clarify and invert second argument of _dl_allocate_tls_init - elf: Support recursive use of dynamic TLS in interposed malloc - nptl: Use <support/check.h> facilities in tst-setuid3 - posix: Use <support/check.h> facilities in tst-truncate and tst-truncate64 - ungetc: Fix backup buffer leak on program exit [BZ #27821] - ungetc: Fix uninitialized read when putting into unused streams [BZ #27821] - Make tst-ungetc use libsupport - stdio-common: Add test for vfscanf with matches longer than INT_MAX [BZ #27650] - support: Add FAIL test failure helper - string: strerror, strsignal cannot use buffer after dlmopen (bug 32026) - Define __libc_initial for the static libc - x86: Fix bug in strchrnul-evex512 [BZ #32078] - Adjust check-local-headers test for libaudit 4.0 - x32/cet: Support shadow stack during startup for Linux 6.10 - x86-64: Remove sysdeps/x86_64/x32/dl-machine.h - support: Add options list terminator to the test driver - manual/stdio: Further clarify putc, putwc, getc, and getwc - Fix name space violation in fortify wrappers (bug 32052) - resolv: Fix tst-resolv-short-response for older GCC (bug 32042) - Add mremap tests - mremap: Update manual entry - linux: Update the mremap C implementation [BZ #31968] - Enhanced test coverage for strncmp, wcsncmp - Enhance test coverage for strnlen, wcsnlen Resolves: RHEL-57776 Resolves: RHEL-57777 Resolves: RHEL-61392
257 lines
6.9 KiB
Diff
257 lines
6.9 KiB
Diff
commit 988de945389e22460a2f75e677d55ac5f96408f3
|
|
Author: Joseph Myers <josmyers@redhat.com>
|
|
Date: Fri Sep 20 23:23:13 2024 +0000
|
|
|
|
Make tst-strtod2 and tst-strtod5 type-generic
|
|
|
|
Some of the strtod tests use type-generic machinery in tst-strtod.h to
|
|
test the strto* functions for all floating types, while others only
|
|
test double even when the tests are in fact meaningful for all
|
|
floating types.
|
|
|
|
Convert tst-strtod2 and tst-strtod5 to use the type-generic machinery
|
|
so they test all floating types. I haven't tried to convert them to
|
|
use newer test interfaces in other ways, just made the changes
|
|
necessary to use the type-generic machinery.
|
|
|
|
Tested for x86_64.
|
|
|
|
(cherry picked from commit 8de031bcb9adfa736c0caed2c79d10947b8d8f48)
|
|
|
|
diff --git a/stdlib/tst-strtod2.c b/stdlib/tst-strtod2.c
|
|
index a7df82ebbde14c5f..2cb0953fa911efd0 100644
|
|
--- a/stdlib/tst-strtod2.c
|
|
+++ b/stdlib/tst-strtod2.c
|
|
@@ -1,43 +1,61 @@
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
|
|
-struct test
|
|
-{
|
|
- const char *str;
|
|
- double result;
|
|
- size_t offset;
|
|
-} tests[] =
|
|
-{
|
|
- { "0xy", 0.0, 1 },
|
|
- { "0x.y", 0.0, 1 },
|
|
- { "0x0.y", 0.0, 4 },
|
|
- { "0x.0y", 0.0, 4 },
|
|
- { ".y", 0.0, 0 },
|
|
- { "0.y", 0.0, 2 },
|
|
- { ".0y", 0.0, 2 }
|
|
-};
|
|
+#include "tst-strtod.h"
|
|
+
|
|
+#define TEST_STRTOD(FSUF, FTYPE, FTOSTR, LSUF, CSUF) \
|
|
+struct test_strto ## FSUF \
|
|
+{ \
|
|
+ const char *str; \
|
|
+ FTYPE result; \
|
|
+ size_t offset; \
|
|
+} tests_strto ## FSUF[] = \
|
|
+{ \
|
|
+ { "0xy", 0.0 ## LSUF, 1 }, \
|
|
+ { "0x.y", 0.0 ## LSUF, 1 }, \
|
|
+ { "0x0.y", 0.0 ## LSUF, 4 }, \
|
|
+ { "0x.0y", 0.0 ## LSUF, 4 }, \
|
|
+ { ".y", 0.0 ## LSUF, 0 }, \
|
|
+ { "0.y", 0.0 ## LSUF, 2 }, \
|
|
+ { ".0y", 0.0 ## LSUF, 2 } \
|
|
+}; \
|
|
+ \
|
|
+static int \
|
|
+test_strto ## FSUF (void) \
|
|
+{ \
|
|
+ int status = 0; \
|
|
+ for (size_t i = 0; \
|
|
+ i < sizeof (tests_strto ## FSUF) / sizeof (tests_strto ## FSUF[0]); \
|
|
+ ++i) \
|
|
+ { \
|
|
+ char *ep; \
|
|
+ FTYPE r = strto ## FSUF (tests_strto ## FSUF[i].str, &ep); \
|
|
+ if (r != tests_strto ## FSUF[i].result) \
|
|
+ { \
|
|
+ char buf1[FSTRLENMAX], buf2[FSTRLENMAX]; \
|
|
+ FTOSTR (buf1, sizeof (buf1), "%g", r); \
|
|
+ FTOSTR (buf2, sizeof (buf2), "%g", tests_strto ## FSUF[i].result); \
|
|
+ printf ("test %zu r = %s, expect %s\n", i, buf1, buf2); \
|
|
+ status = 1; \
|
|
+ } \
|
|
+ if (ep != tests_strto ## FSUF[i].str + tests_strto ## FSUF[i].offset) \
|
|
+ { \
|
|
+ printf ("test %zu strto" #FSUF \
|
|
+ " parsed %tu characters, expected %zu\n", \
|
|
+ i, ep - tests_strto ## FSUF[i].str, \
|
|
+ tests_strto ## FSUF[i].offset); \
|
|
+ status = 1; \
|
|
+ } \
|
|
+ } \
|
|
+ return status; \
|
|
+}
|
|
+
|
|
+GEN_TEST_STRTOD_FOREACH (TEST_STRTOD)
|
|
|
|
static int
|
|
do_test (void)
|
|
{
|
|
- int status = 0;
|
|
- for (size_t i = 0; i < sizeof (tests) / sizeof (tests[0]); ++i)
|
|
- {
|
|
- char *ep;
|
|
- double r = strtod (tests[i].str, &ep);
|
|
- if (r != tests[i].result)
|
|
- {
|
|
- printf ("test %zu r = %g, expect %g\n", i, r, tests[i].result);
|
|
- status = 1;
|
|
- }
|
|
- if (ep != tests[i].str + tests[i].offset)
|
|
- {
|
|
- printf ("test %zu strtod parsed %tu characters, expected %zu\n",
|
|
- i, ep - tests[i].str, tests[i].offset);
|
|
- status = 1;
|
|
- }
|
|
- }
|
|
- return status;
|
|
+ return STRTOD_TEST_FOREACH (test_strto);
|
|
}
|
|
|
|
#define TEST_FUNCTION do_test ()
|
|
diff --git a/stdlib/tst-strtod5.c b/stdlib/tst-strtod5.c
|
|
index 29153ec0057178e9..7eb9b3a2d7f31b2a 100644
|
|
--- a/stdlib/tst-strtod5.c
|
|
+++ b/stdlib/tst-strtod5.c
|
|
@@ -22,35 +22,75 @@
|
|
#include <string.h>
|
|
#include <math.h>
|
|
|
|
+#include "tst-strtod.h"
|
|
+
|
|
#define NBSP "\xc2\xa0"
|
|
|
|
-static const struct
|
|
-{
|
|
- const char *in;
|
|
- double expected;
|
|
-} tests[] =
|
|
- {
|
|
- { "0", 0.0 },
|
|
- { "000", 0.0 },
|
|
- { "-0", -0.0 },
|
|
- { "-000", -0.0 },
|
|
- { "0,", 0.0 },
|
|
- { "-0,", -0.0 },
|
|
- { "0,0", 0.0 },
|
|
- { "-0,0", -0.0 },
|
|
- { "0e-10", 0.0 },
|
|
- { "-0e-10", -0.0 },
|
|
- { "0,e-10", 0.0 },
|
|
- { "-0,e-10", -0.0 },
|
|
- { "0,0e-10", 0.0 },
|
|
- { "-0,0e-10", -0.0 },
|
|
- { "0e-1000000", 0.0 },
|
|
- { "-0e-1000000", -0.0 },
|
|
- { "0,0e-1000000", 0.0 },
|
|
- { "-0,0e-1000000", -0.0 },
|
|
- };
|
|
-#define NTESTS (sizeof (tests) / sizeof (tests[0]))
|
|
+#define TEST_STRTOD(FSUF, FTYPE, FTOSTR, LSUF, CSUF) \
|
|
+static const struct \
|
|
+{ \
|
|
+ const char *in; \
|
|
+ FTYPE expected; \
|
|
+} tests_strto ## FSUF[] = \
|
|
+ { \
|
|
+ { "0", 0.0 ## LSUF }, \
|
|
+ { "000", 0.0 ## LSUF }, \
|
|
+ { "-0", -0.0 ## LSUF }, \
|
|
+ { "-000", -0.0 ## LSUF }, \
|
|
+ { "0,", 0.0 ## LSUF }, \
|
|
+ { "-0,", -0.0 ## LSUF }, \
|
|
+ { "0,0", 0.0 ## LSUF }, \
|
|
+ { "-0,0", -0.0 ## LSUF }, \
|
|
+ { "0e-10", 0.0 ## LSUF }, \
|
|
+ { "-0e-10", -0.0 ## LSUF }, \
|
|
+ { "0,e-10", 0.0 ## LSUF }, \
|
|
+ { "-0,e-10", -0.0 ## LSUF }, \
|
|
+ { "0,0e-10", 0.0 ## LSUF }, \
|
|
+ { "-0,0e-10", -0.0 ## LSUF }, \
|
|
+ { "0e-1000000", 0.0 ## LSUF }, \
|
|
+ { "-0e-1000000", -0.0 ## LSUF }, \
|
|
+ { "0,0e-1000000", 0.0 ## LSUF }, \
|
|
+ { "-0,0e-1000000", -0.0 ## LSUF }, \
|
|
+ }; \
|
|
+ \
|
|
+ \
|
|
+static int \
|
|
+test_strto ## FSUF (void) \
|
|
+{ \
|
|
+ int status = 0; \
|
|
+ \
|
|
+ for (int i = 0; \
|
|
+ i < sizeof (tests_strto ## FSUF) / sizeof (tests_strto ## FSUF[0]); \
|
|
+ ++i) \
|
|
+ { \
|
|
+ char *ep; \
|
|
+ FTYPE r = strto ## FSUF (tests_strto ## FSUF[i].in, &ep); \
|
|
+ \
|
|
+ if (*ep != '\0') \
|
|
+ { \
|
|
+ printf ("%d: got rest string \"%s\", expected \"\"\n", i, ep); \
|
|
+ status = 1; \
|
|
+ } \
|
|
+ \
|
|
+ if (r != tests_strto ## FSUF[i].expected \
|
|
+ || (copysign ## CSUF (10.0 ## LSUF, r) \
|
|
+ != copysign ## CSUF (10.0 ## LSUF, \
|
|
+ tests_strto ## FSUF[i].expected))) \
|
|
+ { \
|
|
+ char buf1[FSTRLENMAX], buf2[FSTRLENMAX]; \
|
|
+ FTOSTR (buf1, sizeof (buf1), "%g", r); \
|
|
+ FTOSTR (buf2, sizeof (buf2), "%g", \
|
|
+ tests_strto ## FSUF[i].expected); \
|
|
+ printf ("%d: got wrong results %s, expected %s\n", \
|
|
+ i, buf1, buf2); \
|
|
+ status = 1; \
|
|
+ } \
|
|
+ } \
|
|
+ \
|
|
+ return status; \
|
|
+}
|
|
|
|
+GEN_TEST_STRTOD_FOREACH (TEST_STRTOD)
|
|
|
|
static int
|
|
do_test (void)
|
|
@@ -61,29 +101,7 @@ do_test (void)
|
|
return 1;
|
|
}
|
|
|
|
- int status = 0;
|
|
-
|
|
- for (int i = 0; i < NTESTS; ++i)
|
|
- {
|
|
- char *ep;
|
|
- double r = strtod (tests[i].in, &ep);
|
|
-
|
|
- if (*ep != '\0')
|
|
- {
|
|
- printf ("%d: got rest string \"%s\", expected \"\"\n", i, ep);
|
|
- status = 1;
|
|
- }
|
|
-
|
|
- if (r != tests[i].expected
|
|
- || copysign (10.0, r) != copysign (10.0, tests[i].expected))
|
|
- {
|
|
- printf ("%d: got wrong results %g, expected %g\n",
|
|
- i, r, tests[i].expected);
|
|
- status = 1;
|
|
- }
|
|
- }
|
|
-
|
|
- return status;
|
|
+ return STRTOD_TEST_FOREACH (test_strto);
|
|
}
|
|
|
|
#include <support/test-driver.c>
|