From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by sourceware.org (Postfix) with ESMTP id E500E3858D34 for ; Thu, 2 Jul 2020 20:02:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E500E3858D34 Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-174-GE6pT3DcMSWkuqGmAtS3pA-1; Thu, 02 Jul 2020 16:02:26 -0400 X-MC-Unique: GE6pT3DcMSWkuqGmAtS3pA-1 Received: by mail-qk1-f198.google.com with SMTP id i145so1296098qke.2 for ; Thu, 02 Jul 2020 13:02:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=K56bNtS5LlTo4zlQc9IFl4C+5GCAbJXSLOc/xZz4FLs=; b=VgudFRs9bFKVezZGdPAC8J2o5mWNp/j4eKhbANbmyOwSBp3Btkx1t0TR6mZ7W8zwJx qKycJilOMtjIkSJKVImqDk0gF/IZ+WNnhq70wCsxp6GHQ/kT/tYzqnb9d0nuTRdwkbhE c13uJiAPZdsKuX57W12olVmGN78RNWikLo6Rb7lWYr8K9OFBRWAx9Div8ioqrwC68o4Z 9gG3eNKud4WKZl0x78I8JNMQXWQSYwBA7bXJbwHTihCju+ATTmdtBOoNvEQvfCMk+jTi Le7KZO4CbnPjM+pdxx84EzvIyLeqVu/5Rw9tYc9CYO69WMnlB0i/tbw5Wgv9bPBcbAoc C0sw== X-Gm-Message-State: AOAM530fPvfpPaAGiWK4tjkeNG+yepROhx//HbmSPNF8KnrGYElF/b8l peHOQW3yLo8jU9ncSGdeb9Oj2+t1gcc6ONm6dY3loYgM5i+M3EMnb0wP336f7Y8jhw19vhjuaNm 5iCXnzAzmn+obg6/eJPdL X-Received: by 2002:ac8:3895:: with SMTP id f21mr34042573qtc.41.1593720145922; Thu, 02 Jul 2020 13:02:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyxmBZHyReDkyNXq+YUUexwMk13PiF2D7pbWYei+Vr1IJH/H5TGP2FISnd5bOt28WBZuV0CJQ== X-Received: by 2002:ac8:3895:: with SMTP id f21mr34042539qtc.41.1593720145529; Thu, 02 Jul 2020 13:02:25 -0700 (PDT) Received: from [192.168.1.4] (198-84-170-103.cpe.teksavvy.com. [198.84.170.103]) by smtp.gmail.com with ESMTPSA id f22sm11977936qko.89.2020.07.02.13.02.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 02 Jul 2020 13:02:24 -0700 (PDT) Subject: Re: [PATCH v5 10/13] string: Add strerror, strerror_r, and strerror_l test To: Adhemerval Zanella , libc-alpha@sourceware.org References: <20200619134352.297146-1-adhemerval.zanella@linaro.org> <20200619134352.297146-10-adhemerval.zanella@linaro.org> From: Carlos O'Donell Organization: Red Hat Message-ID: <8c97f78a-c69a-3412-52f3-3db433719221@redhat.com> Date: Thu, 2 Jul 2020 16:02:24 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <20200619134352.297146-10-adhemerval.zanella@linaro.org> Content-Language: en-US X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jul 2020 20:02:30 -0000 On 6/19/20 9:43 AM, Adhemerval Zanella wrote: > Checked on x86-64-linux-gnu, i686-linux-gnu, powerpc64le-linux-gnu, > and s390x-linux-gnu. OK for master. No regressions on x86_64 and i686. Tested-by: Carlos O'Donell Reviewed-by: Carlos O'Donell > --- > string/Makefile | 3 +- > string/tst-strerror.c | 76 +++++++++++++++++++++++++++++++++++++++++++ > support/Makefile | 2 ++ > support/support.h | 4 +++ > support/xnewlocale.c | 31 ++++++++++++++++++ > support/xuselocale.c | 30 +++++++++++++++++ > 6 files changed, 145 insertions(+), 1 deletion(-) > create mode 100644 string/tst-strerror.c > create mode 100644 support/xnewlocale.c > create mode 100644 support/xuselocale.c > > diff --git a/string/Makefile b/string/Makefile > index 470ff77ded..73e5ac2ebe 100644 > --- a/string/Makefile > +++ b/string/Makefile > @@ -65,7 +65,7 @@ tests := tester inl-tester noinl-tester testcopy test-ffs \ > # This test allocates a lot of memory and can run for a long time. > xtests = tst-strcoll-overflow > > -tests-container += tst-strsignal > +tests-container += tst-strsignal tst-strerror OK. Note: - It is OK to put these in tests-container, but they don't particularly need to be in a container. It does provide more test isolation for the installed translated messages. > > # This test needs libdl. > ifeq (yes,$(build-shared)) > @@ -118,5 +118,6 @@ $(objpfx)tst-strxfrm2.out: $(gen-locales) > $(objpfx)bug-strcoll2.out: $(gen-locales) > $(objpfx)tst-strcoll-overflow.out: $(gen-locales) > $(objpfx)tst-strsignal.out: $(gen-locales) > +$(objpfx)tst-strerror.out: $(gen-locales) OK. > > endif > diff --git a/string/tst-strerror.c b/string/tst-strerror.c > new file mode 100644 > index 0000000000..3af51236d7 > --- /dev/null > +++ b/string/tst-strerror.c > @@ -0,0 +1,76 @@ > +/* Test for strerror, strerror_r, and strerror_l. > + > + Copyright (C) 2020 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 > +#include > + > +static int > +do_test (void) > +{ > + xsetlocale (LC_ALL, "C"); > + > + TEST_COMPARE_STRING (strerror (EINVAL), "Invalid argument"); > + TEST_COMPARE_STRING (strerror (-1), "Unknown error -1"); > + > + { > + char buffer[32]; > + TEST_COMPARE_STRING (strerror_r (EINVAL, buffer, 8), > + "Invalid argument"); > + TEST_COMPARE_STRING (strerror_r (-1, buffer, 8), > + "Unknown"); > + TEST_COMPARE_STRING (strerror_r (-1, buffer, 16), > + "Unknown error -"); > + TEST_COMPARE_STRING (strerror_r (-1, buffer, 32), > + "Unknown error -1"); > + } > + > + locale_t l = xnewlocale (LC_ALL_MASK, "pt_BR.UTF-8", NULL); > + > + TEST_COMPARE_STRING (strerror_l (EINVAL, l), "Argumento inv\303\241lido"); > + TEST_COMPARE_STRING (strerror_l (-1, l), "Erro desconhecido -1"); > + > + xuselocale (l); > + > + TEST_COMPARE_STRING (strerror (EINVAL), "Argumento inv\303\241lido"); > + TEST_COMPARE_STRING (strerror (-1), "Erro desconhecido -1"); > + > + { > + char buffer[32]; > + TEST_COMPARE_STRING (strerror_r (EINVAL, buffer, 8), > + "Argumento inv\303\241lido"); > + TEST_COMPARE_STRING (strerror_r (-1, buffer, 8), > + "Erro de"); > + TEST_COMPARE_STRING (strerror_r (-1, buffer, 16), > + "Erro desconheci"); > + TEST_COMPARE_STRING (strerror_r (-1, buffer, 32), > + "Erro desconhecido -1"); > + } > + > + freelocale (l); > + > + return 0; > +} > + > +#include OK. > diff --git a/support/Makefile b/support/Makefile > index 51484310cd..764b471033 100644 > --- a/support/Makefile > +++ b/support/Makefile > @@ -108,6 +108,7 @@ libsupport-routines = \ > xmmap \ > xmprotect \ > xmunmap \ > + xnewlocale \ > xopen \ > xpipe \ > xpoll \ > @@ -173,6 +174,7 @@ libsupport-routines = \ > xsymlink \ > xsysconf \ > xunlink \ > + xuselocale \ > xwaitpid \ > xwrite \ > > diff --git a/support/support.h b/support/support.h > index 8e1a6a17f7..905b5a76d8 100644 > --- a/support/support.h > +++ b/support/support.h > @@ -29,6 +29,8 @@ > #include > /* For ssize_t and off64_t. */ > #include > +/* For locale_t. */ > +#include > > __BEGIN_DECLS > > @@ -92,6 +94,8 @@ char *xasprintf (const char *format, ...) > char *xstrdup (const char *); > char *xstrndup (const char *, size_t); > char *xsetlocale (int category, const char *locale); > +locale_t xnewlocale (int category_mask, const char *locale, locale_t base); > +char *xuselocale (locale_t newloc); > > /* These point to the TOP of the source/build tree, not your (or > support's) subdirectory. */ > diff --git a/support/xnewlocale.c b/support/xnewlocale.c > new file mode 100644 > index 0000000000..f532873c7f > --- /dev/null > +++ b/support/xnewlocale.c > @@ -0,0 +1,31 @@ > +/* newlocale with error checking. > + Copyright (C) 2020 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 > + > +locale_t > +xnewlocale (int category_mask, const char *locale, locale_t base) > +{ > + locale_t r = newlocale (category_mask, locale, base); > + if (r == (locale_t) 0) > + FAIL_EXIT1 ("error: newlocale (%d, \"%s\", %p)\n", category_mask, > + locale, base); > + return r; OK. > +} > diff --git a/support/xuselocale.c b/support/xuselocale.c > new file mode 100644 > index 0000000000..3d6125b57d > --- /dev/null > +++ b/support/xuselocale.c > @@ -0,0 +1,30 @@ > +/* uselocale with error checking. > + Copyright (C) 2020 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 > + > +locale_t > +xuselocale (locale_t newloc) > +{ > + locale_t r = uselocale (newloc); > + if (r == (locale_t) 0) > + FAIL_EXIT1 ("error: uselocale (%p)\n", newloc); > + return r; > +} > OK. -- Cheers, Carlos.