From patchwork Tue Jun 20 15:31:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Preudhomme X-Patchwork-Id: 778382 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 3wsWzc4tWVz9s7f for ; Wed, 21 Jun 2017 01:31:55 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="eE+5K5xD"; 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:cc:from:message-id:date:mime-version :in-reply-to:content-type; q=dns; s=default; b=PS6vDWunIgk3fa6Mp iBnDAessHTh0TG/bFaXurIxIsZ+KBEPLlJmP3ZZifsDO7njRpEc6EWkXksH0ZHW+ 0Bz8cW5Jmuq3Fcm/JTSh6Wp4TZk8yYDwj1PbGtPdCWr0DYsqpSSOKvgquPN0DdZE PlBg9S379O/DQ5GhvLknVnKg2U= 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:cc:from:message-id:date:mime-version :in-reply-to:content-type; s=default; bh=g3Fb2VIDxH2kSx84huw04ic jSVc=; b=eE+5K5xDb59Cdh5f1I3fFqkl3fCe+WpSm7+ED5PS2VF0e6GlpfSwvNF P8K/f0oLX69iWCd/OHBEVjgNE+aEsQNJNdt3I05cEIgly7FWqfDgZXlAnOVljjUx win/i6gS734lxX2wnIEnOmnYqcJEh1wBF4JJpMbh8z2EW655OB3s= Received: (qmail 55820 invoked by alias); 20 Jun 2017 15:31:46 -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 55804 invoked by uid 89); 20 Jun 2017 15:31:45 -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=907, 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; Tue, 20 Jun 2017 15:31:44 +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 800992B; Tue, 20 Jun 2017 08:31:42 -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 AC4903F557; Tue, 20 Jun 2017 08:31:41 -0700 (PDT) Subject: Re: [PATCH, contrib] Support multi-tool sum files in dg-cmp-results.sh To: Mike Stump References: <4b5196b2-d2eb-b6b9-1b9e-79402d466b99@foss.arm.com> Cc: Richard Biener , Jakub Jelinek , "gcc-patches@gcc.gnu.org" From: Thomas Preudhomme Message-ID: <8e7eb199-954a-e549-8b0d-9c154f40a587@foss.arm.com> Date: Tue, 20 Jun 2017 16:31:40 +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: X-IsSubscribed: yes Hi Mike, Sorry, there was a mistake in the patch I sent. Please find an updated patch below. ChangeLog entry unchanged: *** 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. Is this still ok? Best regards, Thomas On 19/06/17 16:55, Mike Stump wrote: > On Jun 14, 2017, at 5:30 AM, Thomas Preudhomme wrote: >> >> 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? > > Ok. > diff --git a/contrib/dg-cmp-results.sh b/contrib/dg-cmp-results.sh index d291769547dcd2a02ecf6f80d60d6be7802af4fd..921e9337d1f8ffea78ef566c351fb48a8f6ca064 100755 --- a/contrib/dg-cmp-results.sh +++ b/contrib/dg-cmp-results.sh @@ -90,8 +90,7 @@ echo "Newer log file: $NFILE" 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' \ +sed $E -e '/^Running target /,/^[[:space:]]+===.*Summary ===/!d' \ -e '/^[A-Z]+:/!d' \ -e '/^(WARNING|ERROR):/d' \ -e 's/\r$//' \ @@ -101,8 +100,7 @@ sed $E -e "1,/$header/d" \ >/tmp/o$$-$OBASE # Create a temporary file from the new file's interesting section. -sed $E -e "1,/$header/d" \ - -e '/^[[:space:]]+===/,$d' \ +sed $E -e '/^Running target /,/^[[:space:]]+===.*Summary ===/!d' \ -e '/^[A-Z]+:/!d' \ -e '/^(WARNING|ERROR):/d' \ -e 's/\r$//' \