From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [80.241.56.172]) by sourceware.org (Postfix) with ESMTPS id C91353850F0B; Thu, 22 Dec 2022 22:03:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C91353850F0B Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=aarsen.me Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=aarsen.me Received: from smtp202.mailbox.org (smtp202.mailbox.org [10.196.197.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4NdPSk06Z7z9sZZ; Thu, 22 Dec 2022 23:03:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aarsen.me; s=MBO0001; t=1671746582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=U2YxATT3oXFPV+O2gA+dhScJ2tAcV3BQQAtMlUmKfCg=; b=dl+pmSAQszJmkvm2T+mmwLd8TKvg1bWjNMfQyUbDPeuFJPys3lPOn2ih4tr/N+yBZP7EWA +Un+5nJl1vPrZY6t7MFvTkXkHMbgyvvIP+0KCdlTz8gNq0kiYPjJYadrK32aIOKuFDeGqX 7KqvmpLrJezIjCTY4FarfaxJBO/d3ZrBBX9g6+ITLipNoxRPn/z/EjoRuYxPIcXoJyj0sr fBnxVPnntXleequ+15/OMFce0kDr1rlpN/divWC/eU/T8lXMFIliIdaXSlRcbOCvThHBm+ KrygLBVCQgMXUkPsTyjfBJGW0ZPpepUMbX47IK80ZFVpar8SIYWcD655DhGtqQ== References: <20221222110306.3869396-3-arsen@aarsen.me> From: Arsen =?utf-8?Q?Arsenovi=C4=87?= To: Jason Merrill Cc: gcc-patches@gcc.gnu.org, jwakely@redhat.com, libstdc++@gcc.gnu.org Subject: Re: [PATCH 3/3] contrib: Add dg-out-generator.pl Date: Thu, 22 Dec 2022 22:56:29 +0100 In-reply-to: Message-ID: <86pmcbgkq4.fsf@aarsen.me> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,KAM_INFOUSMEBIZ,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,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: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, Jason Merrill writes: >> + # Newlines should be more tolerant. >> + s/\n$/(\\n|\\r\\n|\\r)*/; > > Isn't specifically handling \\r\\n redundant with the * operator? To the extent of my knowledge, yes; I left that in since the original tests I was replacing with this script also used this terminator: =2D// { dg-output "default std::handle_contract_violation called: .*.C 21 t= est::fun .*(\n|\r\n|\r)*" } +// { dg-output {contract violation in function test::fun at .*:21:= b > 0(\n|\r\n|\r)*} } +// { dg-output {\[continue:on\](\n|\r\n|\r)*} } That could easily use the simpler [\r\n]* form too: % regexp {^[\r\n]*$} "\r\n\n\n" 1 Feel free to swap that in too. Thanks, have a great night. =2D-=20 Arsen Arsenovi=C4=87 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iOYEARYKAI4WIQT+4rPRE/wAoxYtYGFSwpQwHqLEkwUCY6TUE18UgAAAAAAuAChp c3N1ZXItZnByQG5vdGF0aW9ucy5vcGVucGdwLmZpZnRoaG9yc2VtYW4ubmV0RkVF MkIzRDExM0ZDMDBBMzE2MkQ2MDYxNTJDMjk0MzAxRUEyQzQ5MxAcYXJzZW5AYWFy c2VuLm1lAAoJEFLClDAeosSTz94BAIChGT2nCsKkCTmnYaEesErXNW2uEfu49ffn LsdES+vdAP9pNVymapNvf+ii6ZcJsEa4AViTY9ZqRyU8N9Sqa7DhBA== =QkH/ -----END PGP SIGNATURE----- --=-=-=--