From patchwork Thu Jun 15 16:15:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Preudhomme X-Patchwork-Id: 776351 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3wpTC226QZz9s5L for ; Fri, 16 Jun 2017 02:16:11 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="Gm534xJV"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :subject:to:references:from:message-id:date:mime-version :in-reply-to:content-type; q=dns; s=default; b=hCnfPp4sIflQZ8HGY OOn7+Y4yNINzWM216i80TyOncdC4OQtoICTWABlUYIYCyvJxvhFU7BudfzvSrIsV pmNiN3tqYOR+2zB0jYJAj4lvjkv7iIwxcBSteJRW/30RRqxWBXBBYIr+BWh98jC4 IdsZPaap9xAQ++5R1BET+/6bww= 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 :subject:to:references:from:message-id:date:mime-version :in-reply-to:content-type; s=default; bh=wY8fo5B2e40LTLnqRzQG97/ JVvM=; b=Gm534xJVmlGSq7G3GqSpNQbSC9lXt7VO4R5+gMXUBGl+gTwXy8idG9z AAr4ilfTZe4ui2xPyeM+VVtUcoXuOH4Cl4inRqVlNdUyhWrGjWnHNbcdKxR4bYHb SyPg6ve35IndYKIkLJgJCY8EEYllliXRRUpNixk/YBxtVTwJmoUg= Received: (qmail 41552 invoked by alias); 15 Jun 2017 16:15:55 -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 8781 invoked by uid 89); 15 Jun 2017 16:15:28 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=forgetting, Best, sum X-HELO: foss.arm.com Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 15 Jun 2017 16:15:27 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D4579344; Thu, 15 Jun 2017 09:15:29 -0700 (PDT) Received: from [10.2.206.52] (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 3C3943F41F; Thu, 15 Jun 2017 09:15:29 -0700 (PDT) Subject: Re: [PATCH, contrib] Support multi-tool sum files in dg-cmp-results.sh To: Richard Biener , Jakub Jelinek , "gcc-patches@gcc.gnu.org" References: <4b5196b2-d2eb-b6b9-1b9e-79402d466b99@foss.arm.com> From: Thomas Preudhomme Message-ID: <9ef88587-ec17-5c35-14cc-1ed56136bc98@foss.arm.com> Date: Thu, 15 Jun 2017 17:15:27 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <4b5196b2-d2eb-b6b9-1b9e-79402d466b99@foss.arm.com> X-IsSubscribed: yes Forgetting the patch: check! Sending it later as a reply to the wrong message: check! Hopefully I won't check a second time any of those. Best regards, Thomas On 14/06/17 13:30, Thomas Preudhomme wrote: > Hi, > > dg-cmp-results.sh contrib script is written to work with sum file for > a single tool only. It throws away the header including the first === > line and everything starting from the following ===, assuming it is the > test result. This does not work well for sum files with results for > multiple tools. > > This patch changes the logic to instead keep everything between "Running > target" line and the beginning of Summary line. Other existing filter > mechanism will ensure only FAIL, PASS, etc. lines are kept after that. > > ChangeLog entry is as follow: > > *** contrib/ChangeLog *** > > 2017-06-14 Thomas Preud'homme > > * dg-cmp-results.sh: Keep test result lines rather than throwing > header and summary to support sum files with multiple tools. > > Tested successfully on sum file with single tool with similar results > and on sum file with multiple tools now showing a regression with patch > proposed in https://gcc.gnu.org/ml/gcc-patches/2017-06/msg00875.html > > Is this ok for trunk? > > Best regards, > > Thomas diff --git a/contrib/dg-cmp-results.sh b/contrib/dg-cmp-results.sh index d291769547dcd2a02ecf6f80d60d6be7802af4fd..d875b4bd8bca16c1f381355612ef34f6879c5674 100755 --- a/contrib/dg-cmp-results.sh +++ b/contrib/dg-cmp-results.sh @@ -91,8 +91,7 @@ sed $E -e '/^[[:space:]]+===/,$d' $NFILE # Create a temporary file from the old file's interesting section. sed $E -e "1,/$header/d" \ - -e '/^[[:space:]]+===/,$d' \ - -e '/^[A-Z]+:/!d' \ + -e '/^Running target /,/^[[:space:]]+===.*Summary ===/!d' \ -e '/^(WARNING|ERROR):/d' \ -e 's/\r$//' \ -e 's/^/O:/' \ @@ -102,8 +101,7 @@ sed $E -e "1,/$header/d" \ # Create a temporary file from the new file's interesting section. sed $E -e "1,/$header/d" \ - -e '/^[[:space:]]+===/,$d' \ - -e '/^[A-Z]+:/!d' \ + -e '/^Running target /,/^[[:space:]]+===.*Summary ===/!d' \ -e '/^(WARNING|ERROR):/d' \ -e 's/\r$//' \ -e 's/^/N:/' \