From patchwork Wed Jun 21 15:30:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Preudhomme X-Patchwork-Id: 778967 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 3wt7wM6chzz9s2G for ; Thu, 22 Jun 2017 01:31:14 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="upwRU9wY"; 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:to :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=HEIk8pKf2YukcFTn0Y6tXSK/1Pu8fvt5yw0+bUzj3OVDIjhRsm OWbnuGYaMc5OOLY7rW85CsvW2OwG2SQvrVWIsRQCEgLYyUDsuHqgMzucvSo1ESql d7jRGnb2s6yUsyHc5Ae+s7TpwCkFFOvSt2K0R4St+BvtK3Aw/6RBdnbnE= 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:to :from:subject:message-id:date:mime-version:content-type; s= default; bh=t4D4SZo4LIyHPL/BaanM5mcgllI=; b=upwRU9wYSrUoHPQvshNn 119pEDJIeC/YsdRuWsC5VH1eJj5iuABvXa9wGW/Ph+qxXZMYVKFZDNhDb+3HKYwe 5mlqfxpJirLnFLrLyilvNd5oAe7PhyvzymJZ3uMJQsasFSXkLtV+uWu5KQ4On3tc W3eFsomyhG2UlSw/xzNbeV0= Received: (qmail 111158 invoked by alias); 21 Jun 2017 15:31:01 -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 111120 invoked by uid 89); 21 Jun 2017 15:31:00 -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= 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; Wed, 21 Jun 2017 15:30:59 +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 05FF9344; Wed, 21 Jun 2017 08:30:57 -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 8893A3F587; Wed, 21 Jun 2017 08:30:56 -0700 (PDT) To: Mike Stump , "gcc-patches@gcc.gnu.org" From: Thomas Preudhomme Subject: [PATCH, GCC/contrib] Fix variant selection in dg-cmp-results.sh Message-ID: Date: Wed, 21 Jun 2017 16:30:55 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 X-IsSubscribed: yes Hi, Commit r249422 to dg-cmp-results.sh broke the variant selection feature where one can restrict the regression test to a specific target variant. This fix restores the feature. ChangeLog entry is as follows: *** contrib/ChangeLog *** 2017-06-21 Thomas Preud'homme * dg-cmp-results.sh: Restore filtering on target variant. Tested on a file with multiple variants which now gives sane results. Is this ok for trunk? Best regards, Thomas diff --git a/contrib/dg-cmp-results.sh b/contrib/dg-cmp-results.sh index 921e9337d1f8ffea78ef566c351fb48a8f6ca064..5f2fed5ec3ff0c66d22bc07c84571568730fbcac 100755 --- a/contrib/dg-cmp-results.sh +++ b/contrib/dg-cmp-results.sh @@ -90,7 +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 '/^Running target /,/^[[:space:]]+===.*Summary ===/!d' \ +sed $E -e "/$header/,/^[[:space:]]+===.*Summary ===/!d" \ -e '/^[A-Z]+:/!d' \ -e '/^(WARNING|ERROR):/d' \ -e 's/\r$//' \ @@ -100,7 +100,7 @@ sed $E -e '/^Running target /,/^[[:space:]]+===.*Summary ===/!d' \ >/tmp/o$$-$OBASE # Create a temporary file from the new file's interesting section. -sed $E -e '/^Running target /,/^[[:space:]]+===.*Summary ===/!d' \ +sed $E -e "/$header/,/^[[:space:]]+===.*Summary ===/!d" \ -e '/^[A-Z]+:/!d' \ -e '/^(WARNING|ERROR):/d' \ -e 's/\r$//' \