From patchwork Tue Feb 27 22:15:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Modra X-Patchwork-Id: 878849 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-473967-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="qaOJMJ/g"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zrY1M2fbjz9s1s for ; Wed, 28 Feb 2018 09:15:50 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; q=dns; s= default; b=XcJTgWt1VQ+9YCuYkP43mVLZv8bsHsp8/kd9PRPCULuWn5t+o8HpU A+/82L6hZbc4bjnWDofnNBp3nfTY0GbJOKqI9p2rdXy3ICFWTavUV1U0rfNOUIur oHXTsCTdOTWWooh7gj7ka2XilOAxTJ/LK4tAvDiX9nA/GYvXLzWGG4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; s= default; bh=vn1FuhY+FjMsILxyirwl830wIWI=; b=qaOJMJ/g3SDzYzBz/9x8 XHqw2eOsTlm4cpR/DnQ700wAtdQDTx8f65piaeZCMjSxT845ankC925D4iffJoAL TaJWoFi1GAn3M6eFK3yqeQxMEvdXxWlt4Vt5MoUhEKZkehMlo7Ue+uiVe+4QUj6G kIFpsv76KmumSUjxcwv9jlw= Received: (qmail 89901 invoked by alias); 27 Feb 2018 22:15:42 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 81082 invoked by uid 89); 27 Feb 2018 22:15:30 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.4 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-pf0-f182.google.com Received: from mail-pf0-f182.google.com (HELO mail-pf0-f182.google.com) (209.85.192.182) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 27 Feb 2018 22:15:28 +0000 Received: by mail-pf0-f182.google.com with SMTP id y186so161694pfb.2 for ; Tue, 27 Feb 2018 14:15:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition:user-agent; bh=j8Un3yZwf2LqR8vzDoZF5KlxsnQqFbQQUBn2ENi8Yj4=; b=Ei5sNJVJQrDMOGwjAAscjfpaPrHd3vtUZSsWVfGmxP7QMT0LV1UcEu+FohEX28x5Vo /6n31PCawkUcZ8+NQ1oOCQcXxil5z1BHEYVWIp0zkkOKdGlZm4XuhXD3uKCOOUa500Vk XOiqD2lAAwZHfJjSvD23OPCxJh2Vou8NyKKS+z8OfaBPJdNjt9mhRZTzkOw5NlKyWd5y y2gJOWshwDiSql0wGFkmy9q3Pp2uj8oY9GmmFSsAB/ng70/LTSNioOksXEhw8W+l4wlo cpWsYNRwGYC/oLLr2hat3DUcjEPPi34f40h5JO7jEHSvv9UyDbXQdhrh0VAhEorPDBn5 mP0w== X-Gm-Message-State: APf1xPC8HELaUnw+IYTLKxdR4O+eMqB4rlhx0hIJwaWeeEyqzpDSyrKZ A52SmwsTn8OH2BRLHbE1piXKPg== X-Google-Smtp-Source: AH8x225rO5PTj4VLM8/4eO8q/LM6nB75WPAwo07fENUU6oxqkNKFBSJho7lnQ+61FxDgWI+ylFzDuw== X-Received: by 10.99.158.17 with SMTP id s17mr12555763pgd.64.1519769706683; Tue, 27 Feb 2018 14:15:06 -0800 (PST) Received: from bubble.grove.modra.org (CPE-58-175-241-133.hdcz1.win.bigpond.net.au. [58.175.241.133]) by smtp.gmail.com with ESMTPSA id x124sm173013pfx.105.2018.02.27.14.15.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Feb 2018 14:15:05 -0800 (PST) Received: by bubble.grove.modra.org (Postfix, from userid 1000) id 85BFAC1376; Wed, 28 Feb 2018 08:45:01 +1030 (ACDT) Date: Wed, 28 Feb 2018 08:45:01 +1030 From: Alan Modra To: gcc-patches@gcc.gnu.org Subject: gcc testsuite changes for new linker messages Message-ID: <20180227221501.GW3812@bubble.grove.modra.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-IsSubscribed: yes GNU ld error messages have changed to comply with the GNU coding standards. The two fixes in this patch look to be the only required changes in the GCC testsuite. I've written the prune_gcc_output patch the way I have to try to capture the fact that the lower case "in function" is correct for a message preceded by "ld: object(sec+off): " but "In function" is correct when the phrase starts a sentence. Bootstrapped and regression tested x86_64-linux. OK to apply all branches? * lib/prune.exp (prune_gcc_output): Match lower case "in function" GNU ld message. * g++.dg/other/anon5.C: Match lower case "bad value" GNU ld message. diff --git a/gcc/testsuite/g++.dg/other/anon5.C b/gcc/testsuite/g++.dg/other/anon5.C index 2a6f57f..ee4601e 100644 --- a/gcc/testsuite/g++.dg/other/anon5.C +++ b/gcc/testsuite/g++.dg/other/anon5.C @@ -4,7 +4,7 @@ // Ignore additional message on powerpc-ibm-aix // { dg-prune-output "obtain more information" } */ // Ignore additional messages on Linux/x86 with PIE -// { dg-prune-output "Bad value" } */ +// { dg-prune-output "\[Bb\]ad value" } */ namespace { struct c diff --git a/gcc/testsuite/lib/prune.exp b/gcc/testsuite/lib/prune.exp index 2f26c6f..1e11dc9 100644 --- a/gcc/testsuite/lib/prune.exp +++ b/gcc/testsuite/lib/prune.exp @@ -31,7 +31,7 @@ proc prune_gcc_output { text } { # Handle any freeform regexps. set text [handle-dg-regexps $text] - regsub -all "(^|\n)(\[^\n\]*: )?In ((static member |lambda )?function|member|method|(copy )?constructor|destructor|instantiation|substitution|program|subroutine|block-data)\[^\n\]*" $text "" text + regsub -all "(^|\n)(\[^\n\]*: \[iI\]|I)n ((static member |lambda )?function|member|method|(copy )?constructor|destructor|instantiation|substitution|program|subroutine|block-data)\[^\n\]*" $text "" text regsub -all "(^|\n)\[^\n\]*(: )?At (top level|global scope):\[^\n\]*" $text "" text regsub -all "(^|\n)\[^\n\]*: (recursively )?required \[^\n\]*" $text "" text regsub -all "(^|\n)\[^\n\]*: . skipping \[0-9\]* instantiation contexts \[^\n\]*" $text "" text