From patchwork Thu Aug 4 14:50:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul E. Murphy" X-Patchwork-Id: 14313 X-Patchwork-Delegate: carlos@redhat.com Received: (qmail 38861 invoked by alias); 4 Aug 2016 14:51:06 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 38798 invoked by uid 89); 4 Aug 2016 14:51:05 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.6 required=5.0 tests=BAYES_00, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_LOW autolearn=no version=3.3.2 spammy=STR, ftype, addprefix, 2.4.11 X-HELO: mx0a-001b2d01.pphosted.com X-IBM-Helo: d03dlp01.boulder.ibm.com X-IBM-MailFrom: murphyp@linux.vnet.ibm.com From: "Paul E. Murphy" Subject: [PATCH] Add tst-wcstod-round To: "libc-alpha@sourceware.org" Cc: Joseph Myers Date: Thu, 4 Aug 2016 09:50:57 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.0 MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16080414-0004-0000-0000-00001010BCA8 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00005548; HX=3.00000240; KW=3.00000007; PH=3.00000004; SC=3.00000178; SDB=6.00739920; UDB=6.00347944; IPR=6.00512518; BA=6.00004644; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00012156; XFM=3.00000011; UTC=2016-08-04 14:51:00 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16080414-0005-0000-0000-000077B2D392 Message-Id: <70c6242f-931e-56e7-e719-32d063303f00@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-08-04_09:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1608040163 This extends tst-strtod-round with a few trivial changes to also test the wide character variants of strto* using similar macros to other shared tests. * stdlib/tst-strtod-round.c: (L_): New macro to select string encoding. (FNPFX): New macro to select str or wcs prefix. (CHAR): New macro to choose wchar_t or char. (STRM): New macro to choose printf modifier for above. (STRTO): New macro to choose appropriate string -> real function. (TEST_WIDE): Conditional definition to enable wchar_t testing. (FNPFXS): "wcs" or "str" dependent on [TEST_WIDE]. (STR): Support for above macro. (STRX): Likewise. (TEST): Update with above macros. (test): Likewise. (GEN_ONE_TEST): Likewise. (test_in_one_mode): Likewise. * wcsmbs/tst-wcstod-round.c: New file. * wcsmbs/Makefile: (tests): Add tst-wcstod-round (tst-wcstod-round): Add libm depencency for fesetround. --- stdlib/tst-strtod-round.c | 43 +++++++++++++++++++++++++++++++++---------- wcsmbs/Makefile | 3 +++ wcsmbs/tst-wcstod-round.c | 3 +++ 3 files changed, 39 insertions(+), 10 deletions(-) create mode 100644 wcsmbs/tst-wcstod-round.c diff --git a/stdlib/tst-strtod-round.c b/stdlib/tst-strtod-round.c index 509f96a..023d382 100644 --- a/stdlib/tst-strtod-round.c +++ b/stdlib/tst-strtod-round.c @@ -31,9 +31,26 @@ #include "tst-strtod.h" +/* Build the test for wide or normal character strings. */ +#ifdef TEST_WIDE +# define L_(str) L ## str +# define FNPFX wcs +# define CHAR wchar_t +# define STRM "%S" +# define snprintf swprintf +# define strfromf128 wcsfromf128 +#else +# define L_(str) str +# define FNPFX str +# define CHAR char +# define STRM "%s" +#endif + #define _CONCAT(a, b) a ## b #define CONCAT(a, b) _CONCAT (a, b) +#define STRTO(x) CONCAT (CONCAT (FNPFX, to), x) + #if LDBL_MANT_DIG == 106 && LDBL_MAX_EXP == 1024 /* This is a stupid hack for IBM long double. This test ignores inexact values for long double due to the limitations of the @@ -110,7 +127,7 @@ ld106x, ld106d, ld106n, ld106z, ld106u, \ ld113x, ld113d, ld113n, ld113z, ld113u) \ { \ - s, \ + L_ (s), \ { XNTRY (fx, dx, ld64ix, ld64mx, ld106x, ld113x) }, \ { \ { ENTRY (fn, dn, ld64in, ld64mn, ld106n, ld113n) }, \ @@ -131,7 +148,7 @@ struct test_results }; struct test { - const char *s; + const CHAR *s; struct test_exactness exact; struct test_results r[4]; }; @@ -139,19 +156,25 @@ struct test { /* Include the generated test data. */ #include "tst-strtod-round-data.h" +#define STRX(x) #x +#define STR(x) STRX (x) +#define FNPFXS STR (FNPFX) + #define GEN_ONE_TEST(FSUF, FTYPE, FTOSTR, FTOSTRM, LSUF, CSUF) \ { \ - FTYPE f = strto ## FSUF (s, NULL); \ + FTYPE f = STRTO (FSUF) (s, NULL); \ if (f != expected->FSUF \ || (copysign ## CSUF) (1.0 ## LSUF, f) \ != (copysign ## CSUF) (1.0 ## LSUF, expected->FSUF)) \ { \ - char efstr[FSTRLENMAX]; \ - char fstr[FSTRLENMAX]; \ - FTOSTR (efstr, FSTRLENMAX, "%" FTOSTRM "a", expected->FSUF); \ - FTOSTR (fstr, FSTRLENMAX, "%" FTOSTRM "a", f); \ - printf ("strto" #FSUF " (%s) returned %s not %s" \ - " (%s)\n", s, fstr, efstr, mode_name); \ + CHAR efstr[FSTRLENMAX]; \ + CHAR fstr[FSTRLENMAX]; \ + FTOSTR (efstr, FSTRLENMAX, L_("%") L_(FTOSTRM) L_("a"), \ + expected->FSUF); \ + FTOSTR (fstr, FSTRLENMAX, L_("%") L_(FTOSTRM) L_("a"), f);\ + printf (FNPFXS "to" #FSUF " (" STRM ") returned " STRM \ + " not " STRM " (%s)\n", \ + s, fstr, efstr, mode_name); \ if (ROUNDING_TESTS (FTYPE, rnd_mode) || exact->FSUF) \ result = 1; \ else \ @@ -160,7 +183,7 @@ struct test { } static int -test_in_one_mode (const char *s, const struct test_results *expected, +test_in_one_mode (const CHAR *s, const struct test_results *expected, const struct test_exactness *exact, const char *mode_name, int rnd_mode) { diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile index 8b599f7..9384a10 100644 --- a/wcsmbs/Makefile +++ b/wcsmbs/Makefile @@ -49,6 +49,7 @@ strop-tests := wcscmp wcsncmp wmemcmp wcslen wcschr wcsrchr wcscpy wcsnlen \ tests := tst-wcstof wcsmbs-tst1 tst-wcsnlen tst-btowc tst-mbrtowc \ tst-wcrtomb tst-wcpncpy tst-mbsrtowcs tst-wchar-h tst-mbrtowc2 \ tst-c16c32-1 wcsatcliff tst-wcstol-locale tst-wcstod-nan-locale \ + tst-wcstod-round \ $(addprefix test-,$(strop-tests)) include ../Rules @@ -68,6 +69,8 @@ $(objpfx)tst-wcstol-locale.out: $(gen-locales) $(objpfx)tst-wcstod-nan-locale.out: $(gen-locales) endif +$(objpfx)tst-wcstod-round: $(libm) + CFLAGS-wcwidth.c = -I../wctype CFLAGS-wcswidth.c = -I../wctype diff --git a/wcsmbs/tst-wcstod-round.c b/wcsmbs/tst-wcstod-round.c new file mode 100644 index 0000000..474b235 --- /dev/null +++ b/wcsmbs/tst-wcstod-round.c @@ -0,0 +1,3 @@ +#include +#define TEST_WIDE +#include