From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout-p-103.mailbox.org (mout-p-103.mailbox.org [80.241.56.161]) by sourceware.org (Postfix) with ESMTPS id EE3DA383D8C8; Sat, 10 Dec 2022 09:49:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EE3DA383D8C8 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 smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (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-103.mailbox.org (Postfix) with ESMTPS id 4NTjln0dxwz9sTC; Sat, 10 Dec 2022 10:49:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aarsen.me; s=MBO0001; t=1670665765; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+Tc1wBHMn1A6XVR/7/Wn20K6S+8saDrN7a8GTIrpunk=; b=vKWPwHwdxoMNfFaEEQAVl4qVmvU7wC3JsVbMAS5W9f1KRDPBnNO8A7ex6hU/cowTX4g/tp 7Lj3dR7/Gsl7r0AR0VrbsM5hm9SAJfGCXsuRbWzZv2U0NHkTxSF/xjLrPWJYasrOqsbpim x7s9Lqbtfts4vp5VE5zGiNMXOmuzJoJrGJv2s/mO0Hh15vStNaHwOR72IsHco/sRudromH zGRcymwdMO8MUejhK22B1Xv9RkCAsZ98EZ7pmyazCpOqKJLNpe+grE2xlVzINkn6Fj2Gpu x4da7YPdDTHB4mbjr1mG3sxwKvNJfa5FBQ/ngsrED3P95TjV6YfhPP19c8dWAQ== From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= To: gcc-patches@gcc.gnu.org Cc: jason@redhat.com, jwakely@redhat.com, libstdc++@gcc.gnu.org, =?UTF-8?q?Arsen=20Arsenovi=C4=87?= Subject: [PATCH 4/4] contrib: Add dg-out-generator.pl Date: Sat, 10 Dec 2022 10:43:03 +0100 Message-Id: <20221210094303.2180127-5-arsen@aarsen.me> In-Reply-To: <20221210094303.2180127-1-arsen@aarsen.me> References: <20221210094303.2180127-1-arsen@aarsen.me> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4NTjln0dxwz9sTC X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,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: This script is a helper used to generate dg-output lines from an existing program output conveniently. It takes care of escaping Tcl and ARE stuff. contrib/ChangeLog: * dg-out-generator.pl: New file. --- contrib/dg-out-generator.pl | 67 +++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100755 contrib/dg-out-generator.pl diff --git a/contrib/dg-out-generator.pl b/contrib/dg-out-generator.pl new file mode 100755 index 00000000000..38aed2aa38d --- /dev/null +++ b/contrib/dg-out-generator.pl @@ -0,0 +1,67 @@ +#!/usr/bin/env perl +# +# Copyright (C) 2022 GCC Contributors. +# Contributed by Arsen Arsenović. +# +# This script is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. + +# This script reads program output on STDIN, and out of it produces a block of +# dg-output lines that can be yanked at the end of a file. It will escape +# special ARE and Tcl constructs automatically. +# +# Each argument passed on the standard input is treated as a string to be +# replaced by ``.*'' in the final result. This is intended to mask out build +# paths, filenames, etc. +# +# Usage example: + +# $ g++-13 -fcontracts -o test \ +# 'g++.dg/contracts/contracts-access1.C' && \ +# ./test |& dg-out-generator.pl 'g++.dg/contracts/contracts-access1.C' +# // { dg-output "contract violation in function Base::b at .*:11: pub > 0(\n|\r\n|\r)*" } +# // { dg-output "\\\[level:default, role:default, continuation mode:never\\\](\n|\r\n|\r)*" } +# // { dg-output "terminate called without an active exception(\n|\r\n|\r)*" } +# You can now freely dump the above into your testcase. + +use strict; +use warnings; +use POSIX 'floor'; + +my $escapees = '(' . join ('|', map { quotemeta } @ARGV) . ')'; + +sub gboundary($) +{ + my $str = shift; + my $sz = 10.0; + for (;;) + { + my $bnd = join '', (map chr 64 + rand 27, 1 .. floor $sz); + return $bnd unless index ($str, $bnd) >= 0; + $sz += 0.1; + } +} + +while () + { + # Escape our escapees. + my $boundary = gboundary $_; + s/$escapees/$boundary/; + + # Quote stuff special in Tcl ARE. + s/([[\]*+?{}()\\])/\\$1/g; + + # Then, special stuff in TCL itself. + s/([\][\\])/\\$1/g; + + # Newlines should be more tolerant. + s/\n$/(\\n|\\r\\n|\\r)*/; + + # Then split out the boundary, replacing it with .*. + s/$boundary/.*/; + + # Then, let's print it in a dg-output block. + print "// { dg-output \"$_\" }\n"; + } -- 2.38.1