From patchwork Tue Aug 28 21:54:27 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: 29098 Received: (qmail 113000 invoked by alias); 28 Aug 2018 21:54:54 -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 112883 invoked by uid 89); 28 Aug 2018 21:54:53 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, KAM_SHORT, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 spammy= X-HELO: mo19.mail-out.ovh.net From: "Gabriel F. T. Gomes" To: Subject: [PATCH v3 3/3] Add tests with floating-point arguments for err* and verr* functions Date: Tue, 28 Aug 2018 18:54:27 -0300 Message-ID: <20180828215427.18653-4-gabriel@inconstante.eti.br> In-Reply-To: <20180828215427.18653-1-gabriel@inconstante.eti.br> References: <20180828215427.18653-1-gabriel@inconstante.eti.br> MIME-Version: 1.0 X-Ovh-Tracer-Id: 14170294754662338243 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedtjedrgeehgddtudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecu Similarly to what has been done for argp_error, and argp_failure, as well as for warn, warnx, vwarn, and vwarnx, this patch adds new tests for the following functions: err, errx, verr, verrx, error, and error_at_line. The new tests check that the conversion of long double variables into string works correctly on the default format of the type. Future patches will reuse these tests for other formats that long double can take. Tested for powerpc64le. * misc/Makefile (tests): Add tst-ldbl-error. * misc/tst-ldbl-error.c: New file. --- misc/Makefile | 2 +- misc/tst-ldbl-error.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 124 insertions(+), 1 deletion(-) create mode 100644 misc/tst-ldbl-error.c diff --git a/misc/Makefile b/misc/Makefile index e3758e1fe4..1a4aaac1ab 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -85,7 +85,7 @@ tests := tst-dirname tst-tsearch tst-fdset tst-efgcvt tst-mntent tst-hsearch \ tst-mntent-blank-corrupt tst-mntent-blank-passno bug18240 \ tst-preadvwritev tst-preadvwritev64 tst-makedev tst-empty \ tst-preadvwritev2 tst-preadvwritev64v2 tst-warn-wide \ - tst-ldbl-warn + tst-ldbl-warn tst-ldbl-error tests-internal := tst-atomic tst-atomic-long tst-allocate_once tests-static := tst-empty diff --git a/misc/tst-ldbl-error.c b/misc/tst-ldbl-error.c new file mode 100644 index 0000000000..09bba61b5e --- /dev/null +++ b/misc/tst-ldbl-error.c @@ -0,0 +1,123 @@ +/* Test for the long double conversions in *err* 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 + +struct tests +{ + void *callback; + const char *expected; +}; + +va_list args; + +static void +callback_err (void *closure) +{ + err (0, "%Lf", (long double) -1); +} + +static void +callback_errx (void *closure) +{ + errx (0, "%Lf", (long double) -1); +} + +static void +callback_verr (void *closure) +{ + verr (0, "%Lf", args); +} + +static void +callback_verrx (void *closure) +{ + verrx (0, "%Lf", args); +} + +static void +callback_error (void *closure) +{ + error (0, 0, "%Lf", (long double) -1); +} + +static void +callback_error_at_line (void *closure) +{ + error_at_line (0, 0, "", 0, "%Lf", (long double) -1); +} + +static void +do_one_test (void *callback, const char *expected, ...) +{ + struct support_capture_subprocess result; + + va_start (args, expected); + + /* Call 'callback', which fills in the output and error buffers. */ + result = support_capture_subprocess (callback, NULL); + + /* The functions err, errx, verr, and verrx print just the program + name followed by a colon, whereas error and error_at_line print the + whole path to the program. Since the whole path depends on the + working directory used to build and test glibc, remove it from the + comparison against the expected result. */ + const char *needle = "tst-ldbl-error:"; + char *message; + message = strstr (result.err.buffer, needle); + + /* Verify that the output message is as expected. */ + if (strcmp (message, expected) != 0) + { + support_record_failure (); + printf ("error:\n" + " expected: '%s'\n" + " actual: '%s'\n", + expected, message); + } + + va_end (args); +} + +static int +do_test (void) +{ + struct tests tests[] = { + { &callback_err, "tst-ldbl-error: -1.000000: Success\n" }, + { &callback_errx, "tst-ldbl-error: -1.000000\n" }, + { &callback_verr, "tst-ldbl-error: -1.000000: Success\n" }, + { &callback_verrx, "tst-ldbl-error: -1.000000\n" }, + { &callback_error, "tst-ldbl-error: -1.000000\n" }, + { &callback_error_at_line, "tst-ldbl-error::0: -1.000000\n" } + }; + + for (int i = 0; i < sizeof (tests) / sizeof (tests[0]); i++) + { + do_one_test (tests[i].callback, tests[i].expected, (long double) -1); + } + + return 0; +} + +#include