From patchwork Wed Jun 13 21:13:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janis Johnson X-Patchwork-Id: 164764 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]) by ozlabs.org (Postfix) with SMTP id 37C75B701F for ; Thu, 14 Jun 2012 07:13:47 +1000 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1340226828; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Message-ID:Date:From:Reply-To:User-Agent:MIME-Version: To:Subject:Content-Type:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=x4vvGDQqIhASsT5o5g4jfnG4Jas=; b=pbndlkpX1DDz8UO mYcy/ITHvKNeNQbjkymC2vM5Aa6X4rxVAP/GIfObJDSusV442o3+c06l1utVQlOS diYQVsSqbBvGoBYmrkMC1lg7fI1kcG6nOQNLloEUoCSg3m8FVXsnSP0ADYGOdzqj AQ3cepzj9Rd4ZW7MC+hAG5czOqvQ= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Received:Message-ID:Date:From:Reply-To:User-Agent:MIME-Version:To:Subject:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=OhRBNqvkkJ8Uvk+IfFiTry5eCjPwSblS3TQSHrO/gY1fud8xiNfG2ethg8a68O CCsO0eFGzXDcRqnwYS/woYn5+h4kZy6Se4QCLH5B7f5BZH2BtzIQJQaWq9ebm9nc XWRHHRxbDOHCzNSojCGdHOnLDFOBIDpKT9Y4e01A1tatk=; Received: (qmail 28796 invoked by alias); 13 Jun 2012 21:13:43 -0000 Received: (qmail 28784 invoked by uid 22791); 13 Jun 2012 21:13:42 -0000 X-SWARE-Spam-Status: No, hits=-3.6 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_HOSTKARMA_W, RCVD_IN_HOSTKARMA_WL X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 13 Jun 2012 21:13:29 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1Seusa-0004Ua-TD from Janis_Johnson@mentor.com for gcc-patches@gcc.gnu.org; Wed, 13 Jun 2012 14:13:28 -0700 Received: from SVR-ORW-FEM-02.mgc.mentorg.com ([147.34.96.206]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Wed, 13 Jun 2012 14:12:53 -0700 Received: from [127.0.0.1] (147.34.91.1) by svr-orw-fem-02.mgc.mentorg.com (147.34.96.168) with Microsoft SMTP Server id 14.1.289.1; Wed, 13 Jun 2012 14:13:28 -0700 Message-ID: <4FD9027F.90005@mentor.com> Date: Wed, 13 Jun 2012 14:13:35 -0700 From: Janis Johnson Reply-To: User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.28) Gecko/20120313 Thunderbird/3.1.20 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" Subject: [testsuite] scandump.exp: use printable version of regexp 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 Most scan-* procedures used in dg-final test directives use a printable version of the regular expression in the test summary. This patch makes scan-*-dump-tiles do that as well, which eliminates several duplicates in test summaries for expressions that contain a newline. Tested on i686-pc-linux-gnu and arm-none-eabi. OK for mainline? Janis 2012-06-13 Janis Johnson * lib/scandump.exp (scan-dump-times): Use printable version of regexp in test summary line. Index: lib/scandump.exp =================================================================== --- lib/scandump.exp (revision 188482) +++ lib/scandump.exp (working copy) @@ -94,7 +94,8 @@ upvar 3 name testcase set suf [dump-suffix [lindex $args 3]] - set testname "$testcase scan-[lindex $args 0]-dump-times $suf \"[lindex $args 1]\" [lindex $args 2]" + set printable_pattern [make_pattern_printable [lindex $args 1]] + set testname "$testcase scan-[lindex $args 0]-dump-times $suf \"$printable_pattern\" [lindex $args 2]" set src [file tail [lindex $testcase 0]] set output_file "[glob -nocomplain $src.[lindex $args 3]]" if { $output_file == "" } {