From patchwork Thu Apr 6 16:13:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 1766229 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=l0PsysS6; dkim-atps=neutral Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Psmlp6JdCz1yZN for ; Fri, 7 Apr 2023 02:14:14 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8DE29385735A for ; Thu, 6 Apr 2023 16:14:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8DE29385735A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1680797649; bh=RDQjNKXlIgMQ9XlmjvDXFB2jz2xxOQfGn85Iw1iuxl8=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=l0PsysS6+fjblCbAxKBW9kR5S23uXpinztZXEjILx68z5Q5ECPsx6cYnL5L9O0fAs KV6Lee4715b3YTsb61zY5k2+1c4su7z9ezFTDcou52NvqJwogz0HcK3hhHWZlxBYg7 9HyZTSnz6kA24XCA7JGMxGcT33Jjcec2IiVfgNks= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 48E03385843A for ; Thu, 6 Apr 2023 16:13:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 48E03385843A Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-488-9WRi-T85Psm7Ab9y6fj5mw-1; Thu, 06 Apr 2023 12:13:52 -0400 X-MC-Unique: 9WRi-T85Psm7Ab9y6fj5mw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7482B3814591 for ; Thu, 6 Apr 2023 16:13:52 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.192.84]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D2FD3492C3E for ; Thu, 6 Apr 2023 16:13:51 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH] wcsmbs: Re-flow and sort routines, tests variables in Makefile Date: Thu, 06 Apr 2023 18:13:50 +0200 Message-ID: <87wn2pkmyp.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" Eliminate strop-tests because it does not seem to be a simplification. Tested on x86-64-linux-gnu. Reviewed-by: Adhemerval Zanella --- wcsmbs/Makefile | 176 +++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 137 insertions(+), 39 deletions(-) base-commit: fd3149e7fb1e974ce9334b6b196fa989f8893459 diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile index b12a3b0750..4aa43252d7 100644 --- a/wcsmbs/Makefile +++ b/wcsmbs/Makefile @@ -26,46 +26,144 @@ headers := wchar.h bits/wchar.h bits/wchar2.h bits/wchar2-decl.h \ bits/wchar-ldbl.h uchar.h bits/types/__mbstate_t.h \ bits/types/mbstate_t.h bits/types/wint_t.h -routines := wcscat wcschr wcscmp wcscpy wcscspn wcsdup wcslen wcsncat \ - wcsncmp wcsncpy wcspbrk wcsrchr wcsspn wcstok wcsstr wmemchr \ - wmemcmp wmemcpy wmemmove wmemset wcpcpy wcpncpy wmempcpy \ - btowc wctob mbsinit \ - mbrlen mbrtowc wcrtomb mbsrtowcs wcsrtombs \ - mbsnrtowcs wcsnrtombs wcsnlen wcschrnul \ - wcstol wcstoul wcstoll wcstoull wcstod wcstold wcstof \ - wcstol_l wcstoul_l wcstoll_l wcstoull_l \ - wcstod_l wcstold_l wcstof_l \ - wcstod_nan wcstold_nan wcstof_nan \ - wcscoll wcsxfrm \ - wcwidth wcswidth \ - wcscoll_l wcsxfrm_l \ - wcscasecmp wcsncase wcscasecmp_l wcsncase_l \ - wcsmbsload mbsrtowcs_l \ - isoc99_wscanf isoc99_vwscanf isoc99_fwscanf isoc99_vfwscanf \ - isoc99_swscanf isoc99_vswscanf \ - isoc23_wscanf isoc23_vwscanf isoc23_fwscanf isoc23_vfwscanf \ - isoc23_swscanf isoc23_vswscanf \ - mbrtoc8 c8rtomb mbrtoc16 c16rtomb mbrtoc32 c32rtomb +routines := \ + btowc \ + c16rtomb \ + c32rtomb \ + c8rtomb \ + isoc23_fwscanf \ + isoc23_swscanf \ + isoc23_vfwscanf \ + isoc23_vswscanf \ + isoc23_vwscanf \ + isoc23_wscanf \ + isoc99_fwscanf \ + isoc99_swscanf \ + isoc99_vfwscanf \ + isoc99_vswscanf \ + isoc99_vwscanf \ + isoc99_wscanf \ + mbrlen \ + mbrtoc16 \ + mbrtoc32 \ + mbrtoc8 \ + mbrtowc \ + mbsinit \ + mbsnrtowcs \ + mbsrtowcs \ + mbsrtowcs_l \ + wcpcpy \ + wcpncpy \ + wcrtomb \ + wcscasecmp \ + wcscasecmp_l \ + wcscat \ + wcschr \ + wcschrnul \ + wcscmp \ + wcscoll \ + wcscoll_l \ + wcscpy \ + wcscspn \ + wcsdup \ + wcslen \ + wcsmbsload \ + wcsncase \ + wcsncase_l \ + wcsncat \ + wcsncmp \ + wcsncpy \ + wcsnlen \ + wcsnrtombs \ + wcspbrk \ + wcsrchr \ + wcsrtombs \ + wcsspn \ + wcsstr \ + wcstod \ + wcstod_l \ + wcstod_nan \ + wcstof \ + wcstof_l \ + wcstof_nan \ + wcstok \ + wcstol \ + wcstol_l \ + wcstold \ + wcstold_l \ + wcstold_nan \ + wcstoll \ + wcstoll_l \ + wcstoul \ + wcstoul_l \ + wcstoull \ + wcstoull_l \ + wcswidth \ + wcsxfrm \ + wcsxfrm_l \ + wctob \ + wcwidth \ + wmemchr \ + wmemcmp \ + wmemcpy \ + wmemmove \ + wmempcpy \ + wmemset \ + # routines -strop-tests := wcscmp wcsncmp wmemcmp wcslen wcschr wcsrchr wcscpy wcsnlen \ - wcpcpy wcsncpy wcpncpy wcscat wcsncat wcschrnul wcsspn wcspbrk \ - wcscspn wmemchr wmemset -tests := tst-wcstof wcsmbs-tst1 tst-wcsnlen tst-btowc tst-mbrtowc \ - tst-wcrtomb tst-wcpncpy tst-mbsrtowcs tst-wchar-h tst-mbrtowc2 \ - tst-c16c32-1 wcsatcliff tst-wcstol-locale tst-wcstod-nan-locale \ - tst-wcstod-round test-char-types tst-fgetwc-after-eof \ - tst-wcstod-nan-sign tst-c16-surrogate tst-c32-state \ - test-mbrtoc8 test-c8rtomb \ - $(addprefix test-,$(strop-tests)) tst-mbstowcs \ - tst-wprintf-binary \ - tst-wcstol-binary-c11 \ - tst-wcstol-binary-c2x \ - tst-wcstol-binary-gnu11 \ - tst-wcstol-binary-gnu2x \ - tst-wscanf-binary-c11 \ - tst-wscanf-binary-c2x \ - tst-wscanf-binary-gnu11 \ - tst-wscanf-binary-gnu89 +tests := \ + test-c8rtomb \ + test-char-types \ + test-mbrtoc8 \ + test-wcpcpy \ + test-wcpncpy \ + test-wcscat \ + test-wcschr \ + test-wcschrnul \ + test-wcscmp \ + test-wcscpy \ + test-wcscspn \ + test-wcslen \ + test-wcsncat \ + test-wcsncmp \ + test-wcsncpy \ + test-wcsnlen \ + test-wcspbrk \ + test-wcsrchr \ + test-wcsspn \ + test-wmemchr \ + test-wmemcmp \ + test-wmemset \ + tst-btowc \ + tst-c16-surrogate \ + tst-c16c32-1 \ + tst-c32-state \ + tst-fgetwc-after-eof \ + tst-mbrtowc \ + tst-mbrtowc2 \ + tst-mbsrtowcs \ + tst-mbstowcs \ + tst-wchar-h \ + tst-wcpncpy \ + tst-wcrtomb \ + tst-wcsnlen \ + tst-wcstod-nan-locale \ + tst-wcstod-nan-sign \ + tst-wcstod-round \ + tst-wcstof \ + tst-wcstol-binary-c11 \ + tst-wcstol-binary-c2x \ + tst-wcstol-binary-gnu11 \ + tst-wcstol-binary-gnu2x \ + tst-wcstol-locale \ + tst-wprintf-binary \ + tst-wscanf-binary-c11 \ + tst-wscanf-binary-c2x \ + tst-wscanf-binary-gnu11 \ + tst-wscanf-binary-gnu89 \ + wcsatcliff \ + wcsmbs-tst1 \ + # tests include ../Rules