From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1995 invoked by alias); 8 Mar 2010 23:10:34 -0000 Received: (qmail 1660 invoked by uid 22791); 8 Mar 2010 23:10:32 -0000 X-SWARE-Spam-Status: No, hits=-7.1 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 08 Mar 2010 23:10:30 +0000 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o28NAN6v020318 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 8 Mar 2010 18:10:23 -0500 Received: from host0.dyn.jankratochvil.net (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o28NAKGl006317 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 8 Mar 2010 18:10:22 -0500 Received: from host0.dyn.jankratochvil.net (localhost [127.0.0.1]) by host0.dyn.jankratochvil.net (8.14.3/8.14.3) with ESMTP id o28NAKxh019511; Tue, 9 Mar 2010 00:10:20 +0100 Received: (from jkratoch@localhost) by host0.dyn.jankratochvil.net (8.14.3/8.14.3/Submit) id o28NAJPa019510; Tue, 9 Mar 2010 00:10:19 +0100 Date: Mon, 08 Mar 2010 23:10:00 -0000 From: Jan Kratochvil To: gdb-patches@sourceware.org, gcc-patches@gcc.gnu.org Subject: [patch] Fix *.log tests merged output containing "===" Message-ID: <20100308231019.GA19312@host0.dyn.jankratochvil.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-08-17) X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2010-03/txt/msg00343.txt.bz2 Hi, while *.sum files were OK the *.log files sometimes miss the content present in *.sum results. For example gdb.base/bitfields.exp output was missing while gdb.base/bitfields.exp output was present. It got broken if arbitrary "===" string has appeared in the tests output. Grepped dejagnu the proposed more strict pattern should match fine: $ grep === `rpm -ql dejagnu` /usr/share/dejagnu/framework.exp: clone_output "\n\t\t=== $tool Summary for $current_target_name ===\n" /usr/share/dejagnu/framework.exp: clone_output "\n\t\t=== $tool Summary ===\n" /usr/share/dejagnu/runtest.exp:clone_output "\n\t\t=== $tool tests ===\n" For GDB `grep '^Running ' gdb.log | wc -l' changes 1770 -> 1818. For GCC `cat *.log | wc -l' changes 444633 -> 482178. (checked the output change looks OK for both cases) I am not aware why there was "/\===/" instead of just "/===/". OK to check-in? (GCC + GDB approval requested) Thanks, Jan gdb/testsuite/ | contrib/ 2010-03-08 Jan Kratochvil Fix *.log tests output containing "===". * dg-extract-results.sh (/\===/): Rename to ... (/^\t\t=== .* ===$/): ... this pattern. --- a/gdb/testsuite/dg-extract-results.sh +++ b/gdb/testsuite/dg-extract-results.sh @@ -299,7 +299,7 @@ BEGIN { next } } -/\===/ { curvar = ""; next } +/^\t\t=== .* ===$/ { curvar = ""; next } /^(PASS|XPASS|FAIL|XFAIL|UNRESOLVED|WARNING|ERROR|UNSUPPORTED|UNTESTED|KFAIL):/ { testname=\$2 # Ugly hack for gfortran.dg/dg.exp