From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10458 invoked by alias); 15 Oct 2019 19:02:19 -0000 Mailing-List: contact glibc-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: , Sender: glibc-cvs-owner@sourceware.org List-Subscribe: Received: (qmail 10441 invoked by uid 10126); 15 Oct 2019 19:02:19 -0000 Date: Tue, 15 Oct 2019 19:02:00 -0000 Message-ID: <20191015190219.10440.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Gabriel F.T.Gomes To: glibc-cvs@sourceware.org Subject: [glibc/gabriel/powerpc-ieee128-printscan] ldbl-128ibm-compat: Test positional arguments X-Act-Checkin: glibc X-Git-Author: Gabriel F. T. Gomes X-Git-Refname: refs/heads/gabriel/powerpc-ieee128-printscan X-Git-Oldrev: d7dc1efc6d140e3ba28802c5fb03a7138422b7d7 X-Git-Newrev: 58e96547f70914e57cade21dd5b4b7d15edaa71a X-SW-Source: 2019-q4/txt/msg00044.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=58e96547f70914e57cade21dd5b4b7d15edaa71a commit 58e96547f70914e57cade21dd5b4b7d15edaa71a Author: Gabriel F. T. Gomes Date: Thu Jul 11 11:47:12 2019 -0300 ldbl-128ibm-compat: Test positional arguments The format string can request positional parameters, instead of relying on the order in which they appear as arguments. Since this has an effect on how the type of each argument is determined, this patch extends the test cases to use positional parameters with mixed double and long double types, to verify that the IEEE long double implementations of *printf work correctly in this scenario. Tested for powerpc64le. Diff: --- .../ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.c | 12 +++++++++++- sysdeps/ieee754/ldbl-128ibm-compat/test-printf-ldbl-compat.c | 12 +++++++++++- .../ldbl-128ibm-compat/test-wprintf-chk-ldbl-compat.c | 9 ++++++++- .../ieee754/ldbl-128ibm-compat/test-wprintf-ldbl-compat.c | 9 ++++++++- 4 files changed, 38 insertions(+), 4 deletions(-) diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.c index e8e1244..153a35d 100644 --- a/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.c +++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.c @@ -139,6 +139,10 @@ do_test_call (void) /* Print in hexadecimal notation. */ do_test_call_rarg (stdout, "%.10La, %.10a", ld, d); do_test_call_varg (stdout, "%.10La, %.10a", ld, d); + + /* Test positional parameters. */ + do_test_call_varg (stdout, "%3$Lf, %2$Lf, %1$f", + (double) 1, (long double) 2, (long double) 3); } static int @@ -172,7 +176,13 @@ do_test (void) " __vfprintf_chk: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " __vprintf_chk: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " __vsnprintf_chk: -0x1.0000000000p+0, -0x1.0000000000p+0\n" - " __vsprintf_chk: -0x1.0000000000p+0, -0x1.0000000000p+0\n"; + " __vsprintf_chk: -0x1.0000000000p+0, -0x1.0000000000p+0\n" + " __vasprintf_chk: 3.000000, 2.000000, 1.000000\n" + " __vdprintf_chk: 3.000000, 2.000000, 1.000000\n" + " __vfprintf_chk: 3.000000, 2.000000, 1.000000\n" + " __vprintf_chk: 3.000000, 2.000000, 1.000000\n" + " __vsnprintf_chk: 3.000000, 2.000000, 1.000000\n" + " __vsprintf_chk: 3.000000, 2.000000, 1.000000\n"; TEST_COMPARE_STRING (expected, result.out.buffer); return 0; diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-ldbl-compat.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-ldbl-compat.c index 2b8d424..5b0e8d3 100644 --- a/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-ldbl-compat.c +++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-printf-ldbl-compat.c @@ -130,6 +130,10 @@ do_test_call (void) /* Print in hexadecimal notation. */ do_test_call_rarg (stdout, "%.10La, %.10a", ld, d); do_test_call_varg (stdout, "%.10La, %.10a", ld, d); + + /* Test positional parameters. */ + do_test_call_varg (stdout, "%3$Lf, %2$Lf, %1$f", + (double) 1, (long double) 2, (long double) 3); } static int @@ -163,7 +167,13 @@ do_test (void) " vfprintf: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " vprintf: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " vsnprintf: -0x1.0000000000p+0, -0x1.0000000000p+0\n" - " vsprintf: -0x1.0000000000p+0, -0x1.0000000000p+0\n"; + " vsprintf: -0x1.0000000000p+0, -0x1.0000000000p+0\n" + " vasprintf: 3.000000, 2.000000, 1.000000\n" + " vdprintf: 3.000000, 2.000000, 1.000000\n" + " vfprintf: 3.000000, 2.000000, 1.000000\n" + " vprintf: 3.000000, 2.000000, 1.000000\n" + " vsnprintf: 3.000000, 2.000000, 1.000000\n" + " vsprintf: 3.000000, 2.000000, 1.000000\n"; TEST_COMPARE_STRING (expected, result.out.buffer); return 0; diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-chk-ldbl-compat.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-chk-ldbl-compat.c index 0dcabec..4917462 100644 --- a/sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-chk-ldbl-compat.c +++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-chk-ldbl-compat.c @@ -85,6 +85,10 @@ do_test_call (void) /* Print in hexadecimal notation. */ do_test_call_rarg (stdout, L"%.10La, %.10a", ld, d); do_test_call_varg (stdout, L"%.10La, %.10a", ld, d); + + /* Test positional parameters. */ + do_test_call_varg (stdout, L"%3$Lf, %2$Lf, %1$f", + (double) 1, (long double) 2, (long double) 3); } static int @@ -106,7 +110,10 @@ do_test (void) " __wprintf_chk: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " __vfwprintf_chk: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " __vswprintf_chk: -0x1.0000000000p+0, -0x1.0000000000p+0\n" - " __vwprintf_chk: -0x1.0000000000p+0, -0x1.0000000000p+0\n"; + " __vwprintf_chk: -0x1.0000000000p+0, -0x1.0000000000p+0\n" + " __vfwprintf_chk: 3.000000, 2.000000, 1.000000\n" + " __vswprintf_chk: 3.000000, 2.000000, 1.000000\n" + " __vwprintf_chk: 3.000000, 2.000000, 1.000000\n"; TEST_COMPARE_STRING (expected, result.out.buffer); return 0; diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-ldbl-compat.c b/sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-ldbl-compat.c index def4337..008275f 100644 --- a/sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-ldbl-compat.c +++ b/sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-ldbl-compat.c @@ -83,6 +83,10 @@ do_test_call (void) /* Print in hexadecimal notation. */ do_test_call_rarg (stdout, L"%.10La, %.10a", ld, d); do_test_call_varg (stdout, L"%.10La, %.10a", ld, d); + + /* Test positional parameters. */ + do_test_call_varg (stdout, L"%3$Lf, %2$Lf, %1$f", + (double) 1, (long double) 2, (long double) 3); } static int @@ -104,7 +108,10 @@ do_test (void) " wprintf: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " vfwprintf: -0x1.0000000000p+0, -0x1.0000000000p+0\n" " vswprintf: -0x1.0000000000p+0, -0x1.0000000000p+0\n" - " vwprintf: -0x1.0000000000p+0, -0x1.0000000000p+0\n"; + " vwprintf: -0x1.0000000000p+0, -0x1.0000000000p+0\n" + " vfwprintf: 3.000000, 2.000000, 1.000000\n" + " vswprintf: 3.000000, 2.000000, 1.000000\n" + " vwprintf: 3.000000, 2.000000, 1.000000\n"; TEST_COMPARE_STRING (expected, result.out.buffer); return 0;