public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Jason Merrill <jason@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-4860] contrib: Add dg-out-generator.pl Date: Fri, 23 Dec 2022 00:51:38 +0000 (GMT) [thread overview] Message-ID: <20221223005138.51FD03910FE0@sourceware.org> (raw) https://gcc.gnu.org/g:e70380f4545e96bfd1d4ee071fcdd8d46a5ba824 commit r13-4860-ge70380f4545e96bfd1d4ee071fcdd8d46a5ba824 Author: Arsen Arsenović <arsen@aarsen.me> Date: Thu Dec 22 12:03:08 2022 +0100 contrib: Add dg-out-generator.pl 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. Diff: --- contrib/dg-out-generator.pl | 79 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/contrib/dg-out-generator.pl b/contrib/dg-out-generator.pl new file mode 100755 index 00000000000..cd5e99d0a0c --- /dev/null +++ b/contrib/dg-out-generator.pl @@ -0,0 +1,79 @@ +#!/usr/bin/env perl +# +# Copyright (C) 2022 Free Software Foundation, Inc. +# 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 (<STDIN>) + { + # Escape our escapees. + my $boundary; + if (@ARGV) { + # Checking this is necessary to avoid a spurious .* between all + # characters if no arguments are passed. + $boundary = gboundary $_; + s/$escapees/$boundary/g; + } + + # Quote stuff special in Tcl ARE. This step also effectively nulls any + # concern about escaping. As long as all curly braces are escaped, the + # string will, when passing through the braces rule of Tcl, be identical to + # the input. + s/([[\]*+?{}()\\])/\\$1/g; + + # Newlines should be more tolerant. + s/\n$/(\\n|\\r\\n|\\r)/; + + # Then split out the boundary, replacing it with .*. + s/$boundary/.*/g if defined $boundary; + + # Then, let's print it in a dg-output block. If you'd prefer /* keep in + # mind that if your string contains */ it could terminate the comment + # early. Maybe add an extra s!\*/!*()/!g or something. + print "// { dg-output {$_} }\n"; + } + +# File Local Vars: +# indent-tabs-mode: nil +# End:
reply other threads:[~2022-12-23 0:51 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20221223005138.51FD03910FE0@sourceware.org \ --to=jason@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).