From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id DA3E61F731 for ; Fri, 9 Aug 2019 18:33:21 +0000 (UTC) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding:content-type; q=dns; s=default; b=XZQfQYJVYfXrEuVDoB/LgszomCr/ia3dvU4o9JmeKWJ XLlf6DLbt+I1+K0c7+dlv0LdAkQYxdstPvbLJzQkwQJX1IwH9bzmO39gt6o59GBi 8KQ3VxAWSj0f8sR82NQ2FcTXBNLk+lhhlpQN8lHK1A01t3slsdKzoRT306dTC8Bc = DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding:content-type; s=default; bh=LmkshknPGcVJepyCiT6EtYvpQ4c=; b=DQ8x4q+xR08bmGPZv b051x5TdOkVIwJEFBW4xP/BzLlk7OI1tiB0lJnIFZVHKKgKXO9NkCy88tKw2v7Iv jNGAAJ7ipOWVp5RVmg10U8FYJgV6kRjVdLa1dwOXe5LoqhRVBRRQH+W1PxhQdmnK i+RFZOcFuZVprpmzBj7aXswfQ0= Received: (qmail 73013 invoked by alias); 9 Aug 2019 18:32:49 -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 Received: (qmail 72833 invoked by uid 89); 9 Aug 2019 18:32:47 -0000 Authentication-Results: sourceware.org; auth=none X-HELO: smtpout1.mo528.mail-out.ovh.net From: "Gabriel F. T. Gomes" To: Subject: [PATCH 6/6] ldbl-128ibm-compat: Test positional arguments Date: Fri, 9 Aug 2019 15:31:54 -0300 Message-ID: <20190809183154.32605-7-gabriel@inconstante.net.br> In-Reply-To: <20190809183154.32605-1-gabriel@inconstante.net.br> References: <20190809183154.32605-1-gabriel@inconstante.net.br> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Ovh-Tracer-Id: 13567938303485529795 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeduvddruddujedguddvjecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecu From: "Gabriel F. T. Gomes" 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. * sysdeps/ieee754/ldbl-128ibm-compat/test-printf-chk-ldbl-compat.c * sysdeps/ieee754/ldbl-128ibm-compat/test-printf-ldbl-compat.c * sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-chk-ldbl-compat.c * sysdeps/ieee754/ldbl-128ibm-compat/test-wprintf-ldbl-compat.c (do_test_call): Test positional parameters. (do_test): Add results for positional parameters test. --- .../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(-) 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 e8e124425b..153a35d451 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 2b8d424473..5b0e8d3bae 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 0dcabec38a..49174625d4 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 def4337571..008275f529 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; -- 2.21.0