From patchwork Wed Aug 15 20:16:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gabriel F. T. Gomes" X-Patchwork-Id: 28931 Received: (qmail 20654 invoked by alias); 15 Aug 2018 20:16:51 -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 20550 invoked by uid 89); 15 Aug 2018 20:16:51 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-23.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, KAM_SHORT, RCVD_IN_DNSWL_NONE, UNSUBSCRIBE_BODY autolearn=ham version=3.3.2 spammy=1000000 X-HELO: mo20.mail-out.ovh.net From: "Gabriel F. T. Gomes" To: Subject: [PATCH v2 2/3] Add test for warn, warnx, vwarn, and vwarnx with floating-point parameters Date: Wed, 15 Aug 2018 17:16:28 -0300 Message-ID: <20180815201629.20657-3-gabriel@inconstante.eti.br> In-Reply-To: <20180815201629.20657-1-gabriel@inconstante.eti.br> References: <20180815201629.20657-1-gabriel@inconstante.eti.br> MIME-Version: 1.0 X-Ovh-Tracer-Id: 9956895826506272451 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedtjedrudejgdduheegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecufedttdenuc Similarly to what has been done for argp_error and argp_failure, this patch patch adds new tests for the warn, warnx, vwarn, and vwarnx functions. The new tests use the format string to request the conversion of long double parameters into string. Currently, these tests only check that the default format of the long double type works. Future patches will extend the test for platforms that can have an optional format for long double. Tested for powerpc64le. * misc/Makefile (tests-internal): Add tst-ldbl-warn. * misc/tst-ldbl-warn.c: New file. --- misc/Makefile | 2 + misc/tst-ldbl-warn.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+) create mode 100644 misc/tst-ldbl-warn.c diff --git a/misc/Makefile b/misc/Makefile index 9a87e81ae5..c15707878f 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -89,6 +89,8 @@ tests := tst-dirname tst-tsearch tst-fdset tst-efgcvt tst-mntent tst-hsearch \ tests-internal := tst-atomic tst-atomic-long tst-allocate_once tests-static := tst-empty +tests-internal += tst-ldbl-warn + ifeq ($(run-built-tests),yes) tests-special += $(objpfx)tst-error1-mem.out \ $(objpfx)tst-allocate_once-mem.out diff --git a/misc/tst-ldbl-warn.c b/misc/tst-ldbl-warn.c new file mode 100644 index 0000000000..a9406404bf --- /dev/null +++ b/misc/tst-ldbl-warn.c @@ -0,0 +1,115 @@ +/* Test for the long double conversions in *warn* functions. + Copyright (C) 2018 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include +#include +#include + +#include + +enum {WARN, WARNX, VWARN, VWARNX}; + +static void +do_one_test (int select, const char *format, va_list args, + long double arg1, double arg2, long double arg3, + double arg4, const char *expected) +{ + /* Prepare in-memory buffer to hold the output. */ + char *buffer = NULL; + size_t length = 0; + FILE *fp = open_memstream (&buffer, &length); + TEST_VERIFY_EXIT (fp != NULL); + FILE *old_stderr = stderr; + stderr = fp; + + /* Write to the buffer using one of the *warn* functions. */ + switch (select) + { + case WARN: + warn (format, arg1, arg2, arg3, arg4); + break; + case WARNX: + warnx (format, arg1, arg2, arg3, arg4); + break; + case VWARN: + vwarn (format, args); + break; + case VWARNX: + vwarnx (format, args); + break; + } + + stderr = old_stderr; + TEST_VERIFY_EXIT (!ferror (fp)); + TEST_COMPARE (fclose (fp), 0); + + /* Check that the rest of the output is as expected. */ + if (strcmp (buffer, expected) != 0) + FAIL_EXIT1 ("unexpected output: %s", buffer); + free (buffer); +} + +static void +do_test_call_varg (const char *format, ...) +{ + va_list args; + + va_start (args, format); + do_one_test (VWARN, format, args, 0, 0, 0, 0, + "tst-ldbl-warn: " + "-1.000000 - -2.000000 - -3.000000 - -4.000000: Success\n"); + va_end (args); + + va_start (args, format); + do_one_test (VWARNX, format, args, 0, 0, 0, 0, + "tst-ldbl-warn: " + "-1.000000 - -2.000000 - -3.000000 - -4.000000\n"); + va_end (args); +} + +static void +do_test_call_rarg (const char *format, long double arg1, double arg2, + long double arg3, double arg4) +{ + va_list args; + memset (&args, 0, sizeof (args)); + do_one_test (WARN, format, args, arg1, arg2, arg3, arg4, + "tst-ldbl-warn: " + "-1.000000 - -2.000000 - -3.000000 - -4.000000: Success\n"); + do_one_test (WARNX, format, args, arg1, arg2, arg3, arg4, + "tst-ldbl-warn: " + "-1.000000 - -2.000000 - -3.000000 - -4.000000\n"); +} + +static int +do_test (void) +{ + long double arg1 = -1; + long double arg3 = -3; + double arg2 = -2; + double arg4 = -4; + + do_test_call_rarg ("%Lf - %f - %Lf - %f", arg1, arg2, arg3, arg4); + do_test_call_varg ("%Lf - %f - %Lf - %f", arg1, arg2, arg3, arg4); + + return 0; +} + +#include