@@ -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;
@@ -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;
@@ -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;
@@ -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;
From: "Gabriel F. T. Gomes" <gabrielftg@linux.ibm.com> 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. --- .../ldbl-128ibm-compat/test-printf-chk-ldbl-compat.c | 12 +++++++++++- .../ldbl-128ibm-compat/test-printf-ldbl-compat.c | 12 +++++++++++- .../test-wprintf-chk-ldbl-compat.c | 9 ++++++++- .../ldbl-128ibm-compat/test-wprintf-ldbl-compat.c | 9 ++++++++- 4 files changed, 38 insertions(+), 4 deletions(-)