From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0601.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1f::601]) by sourceware.org (Postfix) with ESMTPS id C7A033858C5F for ; Wed, 22 Feb 2023 08:26:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C7A033858C5F Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FmZolEAhpE/4FzfrRrYBRUyypq0Y+GlfECRjgqh4VTdtbhXyirrybJW8R0G/VI7MOgO2ae2t+NpLx7X2MsiKRDs+3+mpNRRk53ae/BT8erQjCUUToL8oSYAICxFx3p6P0G8ws2ONmMIX/UclNTNm65othbilyCU6UnSXZhg5/6VbCwyK4tJ0fKNMbnY+/4ZlcYTreNVdV/EpnMFo3RomHA7VW0X1kC/jU14EvVutnPzfFP0ULaMvLFGm+8i6mq4qmJCdP2RJNoEa6kqKo7mTmhNmF9PpfGQeDQ4P3wTJXrMXlEgxN+3ajUcxlqAi30ez2QTwVMj8mBjkzVyXvlcRcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=uCiXRpSVjG6mmJX0FwDBMkwBYCNjp3myKmT4bBVuR5U=; b=TVfd+j30uQCORWfmNkqqXUTqvvl+sPI2hIvJ33k3MF0sSyhToLAUEMKTLVz6REYTcj6Wl6hUtPljLetCsn3GUZkv3FJ2rIry1Y6WPb9grRpMQ+JGsGjr3W9kW/F6j9caaTbjkxYB+75rOXdbuIw3CHLDrg/J+izA/XbeIHjfIdmmdi+9NqDd5n8T2hhm6BUv8b42+dIcdoJWAXRlgw+002uBCX+KMuN561uXw4zUymWjqo8IQKKBA25PZHdXWYOBPoqIOuhqnR8R6xzU3q7GWUfyufmDAl8bxUnv3H6yuxlw6QU+5SyGRv9018xslgLn7qLYWDEJFDxl6a42XnKACQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uCiXRpSVjG6mmJX0FwDBMkwBYCNjp3myKmT4bBVuR5U=; b=M7v+iOaT1pIm1VfVP3o3Jp0Qnd9BAyIyM9dcB7d5by5lSjRJb0z5h1Xlyn+4ExhGMv32Rss96G6uKQXgv1nOSel5So70hmJJWRHbYLSWRnqwXJu1S9NWwNA8uQzb7FIbCFUUAdi2GW1v3RLDbVyhN4+rW0o4wGTQydrc4dnUJ8kJlQISHd6iUZ+UwLD5Z8lNWgiBSMfPxc9jMkzmzo2W55iBZRyDYoEHw6KsTbIZ7bbZTTBaIj4Q0qoLOfhoJDkUojLu/g637M8o2wYEN0f0GGdllVJif+nCsGPCGQMtflNw8ymAvhVWz3fGobm6bC7x/WH2djlusjFbdsip0aTKug== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AS8PR04MB7991.eurprd04.prod.outlook.com (2603:10a6:20b:289::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.19; Wed, 22 Feb 2023 08:26:36 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::154e:166d:ec25:531b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::154e:166d:ec25:531b%6]) with mapi id 15.20.6134.019; Wed, 22 Feb 2023 08:26:36 +0000 Message-ID: Date: Wed, 22 Feb 2023 09:26:34 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Subject: Re: [PATCH] testsuite: prune DOS drive letter in test outputs Content-Language: en-US To: =?UTF-8?Q?Cl=c3=a9ment_Chigot?= Cc: amodra@gmail.com, binutils@sourceware.org References: <20230221161442.1554824-1-chigot@adacore.com> From: Jan Beulich In-Reply-To: <20230221161442.1554824-1-chigot@adacore.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: FR3P281CA0194.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a4::10) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|AS8PR04MB7991:EE_ X-MS-Office365-Filtering-Correlation-Id: 1456c085-2920-40d6-3402-08db14ae8359 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Zw5B0FzB9DmwrxQLD8P0KJcsiZBxvofHYZXJJFIWOmxqSwyLjciiFBUdfFAR2uIMA7dHZb1US3OkV4ISDhWv+J+jdmX2APwgwubQRHMpfcmiB+5P3W/P9k9sTgOzUaQg73dpHS9uU6kZ1eh4RG2KasW45hOvifiL/aN1H7ngCvw/Ebes5XtSUJx2VCVxg+/ezNlCwnsHNYa57bjYBebztxQdUlpSxeD3DEFhA6cWzTu1uu3ZGJwG6URw4DcpcJgIvx/X7TEXk7Q3pV0JdtRUVC+pXTFyHAitCL0YOqiqOfIeqLrFDBKCKIHk10FffqvScMKA2u8W335JxsmUC3WH0WtMr3pwu4HQMP45AyD4omnpNChK9uoJQjomuZ2F+6JP9vicSDP9Zv3omzqsjrcJhf0Alfkt+a5806v0QK9am9pv03zavMNQtbkfo7H3SawhoHNTWzgW4fHVXBiMBrE0hTCu0vByJzKjKm9oSJQtNbhINJHGTOqa8FR6kSr+3eNOPM20eAJiyjjCFJVKGjWCFQG+UpljNdMG3CIZD0RlDufKd8kquLPcwHeg5Hs4/6zDfUeU1oBBSIApGA95cS84yy2QTQ9rtPp7BDh2F+KkybNZmC41l5VYn/IdH6MNsqJ4SzETXKaoAgepDs5TdOl4a8lkNTmz7I1iM+NJlrjtcEyQxIO3iqhsD4yDZTNJsHFEkxGSi3ye6WrTMioCUcUjcNfamLhokbptUFZKw8JjgAA= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(376002)(346002)(39860400002)(136003)(396003)(366004)(451199018)(478600001)(66574015)(31696002)(38100700002)(86362001)(2906002)(316002)(41300700001)(36756003)(5660300002)(8936002)(83380400001)(66946007)(66476007)(8676002)(66556008)(6916009)(4326008)(31686004)(186003)(26005)(6486002)(6512007)(53546011)(2616005)(6506007)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MHFIMWVOVWJxL242OFdDa0RCbFB1MmlEK29yUDFYV1hNT1hXWEgraHdsUEVq?= =?utf-8?B?akJuWkp0a0JaQXMxVVV1UUtjcVliSUMrTnh6UGhEci9vWGdtcEhES1prb0Vj?= =?utf-8?B?MzVma2drUkttRW5sekVpemJ2bUplbkZMbzBZN1BXcVliMGJ2bTJKZ2VnWndZ?= =?utf-8?B?WCsycXlubHZPQTRsOVExOGJsSVlaUkpLMDM0UFZqc1FBaWQ4cktEMFhlUlVn?= =?utf-8?B?T2pFQXVVWVoyZ2ZkYXNROXpFRDh1TXdvYVNOYXZNRHk5ZjIrUkcwWVB5aHBs?= =?utf-8?B?N1k3L3lIN0srdi82UjFWb1djV1NTYWRwU09LVVc4QjRXcGRrRWoyK2JNZ0tv?= =?utf-8?B?V2tWQ2wvYksxRG1JUUhjZi9SM0pERzh0alFSZ1RTbWZNanlnMnZmL2F0QmdM?= =?utf-8?B?SUhvampHZ2dBWnNRK3YvSUVxVzZLbFVDSVg1K0dKS2NQZ1VlMG8rQmpJbGZP?= =?utf-8?B?a2J1SkJtaFhLaGxKaFN4cFFTWm5SMS9xclVldzlZcnVJWDE4YVlWUHhMNm9k?= =?utf-8?B?eEtONTB6aldITXF4R3p3UDFUaytHcWZVRHordVlDY3VabEt2RUFqMkRkbFNn?= =?utf-8?B?aXc3RC91OVZwYUdXdm5Pa3h3eEZ2K1BabGgwTTkySFJsYnFHSkIrZjZGTTVZ?= =?utf-8?B?Z1pDNGlyczhsSVdXVUVhUW9HVDNEMkZOUlNDTkFMYVdRWHBNQnk4VEJkREJL?= =?utf-8?B?V0JiNU03VjF6eEhHQnVwMXJuS3NtT1pjZm5FTFRQeTQvSnJRQXRlWDhYdEZk?= =?utf-8?B?Q2I3d0R5R1g1dWVXMVlEMVl0U01UblNaSHFqT2hhVU03OFZIdzhTRHQwczdL?= =?utf-8?B?RXNzbjNPb0VicmV5ZVNDZXVublUzRHU0aHpFVktyR3dacmJmdGNlejVGZnli?= =?utf-8?B?QkJNeTQ5VUJnNkx2OWJ3Z2lDRG9UTnNKd2VBMHBlbTNZQ3RnYWFaaUIyVzVZ?= =?utf-8?B?R3FQQW9lb2FMckRLSXVpbEpBRWlzVmhYY2lpTnlOZmpkdnVNTHVxQnd4aENO?= =?utf-8?B?OGtjTk1JNDFJdGhmeTJ4VFlUOGpGRGV1aDJUMnVIdkxLa0kzQm8wRzYzQlVG?= =?utf-8?B?ck10MWFXaVlEMHJuTDZBdDVMOGFYUGtHZXNFbGdIUjNUZmhweEs0dGcyYkhi?= =?utf-8?B?OERLWGJxYjZXd1hXUFJocFVSd1czMWVmSFpJeTFtWkVJbUh6UkM3NWM1YlZM?= =?utf-8?B?djJ5Tm1aSFhFcHZUcmhTZU5yQnhzb2tjcTdaM0x4RVNFNnZYM2VvNjJ0MHFn?= =?utf-8?B?N2JpSlQ2Vmt2TW52SE52QjN5M3ZybG50SXFyd2QwWmFZUXpHVGppcDBrcU5r?= =?utf-8?B?cGIwNWd6ck03bEhUNTRVZjRQUTVxWFZ4U1lIb01paU9hazFsUDY1czJUYklj?= =?utf-8?B?anpQbFlzc3Z4QUVJalI3b1llMysxc3dHWWRwQ2xxakU5ek5tZExoOGtpU3JN?= =?utf-8?B?MWFIQUVkdDNQKzRiZnp4MnF2ZExXQjNEaWRMTEZlaUxmSzdIOS9CeGxRTkhZ?= =?utf-8?B?R3VJbS91YUVxTnVwYnVydS9hNk96WFo3OW5ldUdEaDRYalhGUmtwZGtTWENQ?= =?utf-8?B?anU3R1A2UFhYU09rSHFzS3ZSRmU1VXFqbmdFVTVvYmFCQ2pPeHpOSFJwWDNa?= =?utf-8?B?RitVclh4eUZNbEJISlgwQ1RUMzdSQnRGNm9rcVZ4ZE9mM09vSkFSNWxsQ0tN?= =?utf-8?B?WFUrb2VURWkrb3doMWQrWHpTekY4aUUzT3hlTldhMTJmSFVPbk9ZZlYrMUpU?= =?utf-8?B?OU9zVE1EUzMwaWU1UmlFam9HTm5wd2hiVHNUdWhVdm5naDVuUUdQZnhDa2Ft?= =?utf-8?B?dDZzVFNrb2RTUUlHc2xjdTdORjJHM1VqNkhrYURlbk43MGVpTmsySEVzWGNG?= =?utf-8?B?b3JGZWZ5YWlJV1dKSnUxTjlURnRoNzRYTDB4ODY3YWFlQ1MvSWlEQlJBL2NP?= =?utf-8?B?T3BYV0JXY0ZWZFIvQWxMR1BmWW1zK0xyOW9YV1h6VG1mWjUzaXRFWmlTcG9m?= =?utf-8?B?dkIraHFtVTN3aTZmQVhSaVRRY0V4U3hGbUlnR2hGN0hrZTB3amVIZ3VLSUZX?= =?utf-8?B?ZmRCUVdmWjRKUEd3ZjN2OTFzbmsrNXo2dHdQWXB6ejdyb3ZSa1hmeFZrUkM2?= =?utf-8?Q?nzA5sWKP7QtaNjg7E4dK2AxEJ?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1456c085-2920-40d6-3402-08db14ae8359 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2023 08:26:36.5302 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 5j2hK7HxfmgfLF8HUCV6eGJjVd1d9yUiBGFuZqS/3Z4SvV6mD+PfGT35H99Y+4BgV6bd1WEcHw0FOiNAD9MGMA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7991 X-Spam-Status: No, score=-3028.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,SPF_HELO_PASS,SPF_PASS,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 List-Id: On 21.02.2023 17:14, Clément Chigot wrote: > --- a/binutils/testsuite/lib/binutils-common.exp > +++ b/binutils/testsuite/lib/binutils-common.exp > @@ -687,6 +687,22 @@ if ![string length [info proc prune_warnings]] { > } > } > > +# prune_dump_output OUTPUT > +# > +# Clean up the output from system specific or unwanted characters. > +# This allows to simplify the regexp inside dump tests. > +proc prune_dump_output { output } { > + if [ishost "*-*-mingw*"] { Cygwin as well then? > + # Prune DOS drive letter from an absolute path if it appears > + # at the beginning of a line. > + regsub -all "(^|\n)\[\[:upper:\]\]:" $output "\\1" output Drive letters aren't guaranteed upper case, are they? I also think this may end up too lax, as there may be messages which don't start with a path. I would expect that you want to also match "warning:", "error:", and alike infixes. Plus wouldn't you better match (but not remove) the first \ or / following the colon? > --- a/ld/testsuite/ld-elf/noinit-sections-2.l > +++ b/ld/testsuite/ld-elf/noinit-sections-2.l > @@ -1,5 +1,5 @@ > #... > -(|.:)[^:]*: warning: orphan section `.noinit.var_noinit' from \S+ being placed in section `.noinit.var_noinit' > +[^:]*: warning: orphan section `.noinit.var_noinit' from \S+ being placed in section `.noinit.var_noinit' > #... > -(|.:)[^:]*: warning: orphan section `.gnu.linkonce.n.var_noinit2' from \S+ being placed in section `.gnu.linkonce.n.var_noinit2' > +[^:]*: warning: orphan section `.gnu.linkonce.n.var_noinit2' from \S+ being placed in section `.gnu.linkonce.n.var_noinit2' > #pass Did you commit the earlier patch, which now needs reverting? Jan