From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4859 invoked by alias); 22 Mar 2010 20:24:14 -0000 Received: (qmail 4844 invoked by uid 22791); 22 Mar 2010 20:24:13 -0000 X-SWARE-Spam-Status: No, hits=-7.3 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, 22 Mar 2010 20:24:07 +0000 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o2MKO6ev005976 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 22 Mar 2010 16:24:06 -0400 Received: from host0.dyn.jankratochvil.net (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o2MKO3Oc004921 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 22 Mar 2010 16:24:05 -0400 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 o2MKO3sI022444; Mon, 22 Mar 2010 21:24:03 +0100 Received: (from jkratoch@localhost) by host0.dyn.jankratochvil.net (8.14.3/8.14.3/Submit) id o2MKO2tS022442; Mon, 22 Mar 2010 21:24:02 +0100 Date: Mon, 22 Mar 2010 20:24:00 -0000 From: Jan Kratochvil To: Tom Tromey Cc: gdb-patches@sourceware.org Subject: Re: [patch] Fix *.log tests merged output containing "===" Message-ID: <20100322202402.GA22182@host0.dyn.jankratochvil.net> References: <20100308231019.GA19312@host0.dyn.jankratochvil.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: 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/msg00776.txt.bz2 On Mon, 22 Mar 2010 20:39:53 +0100, Tom Tromey wrote: > >>>>> "Jan" == Jan Kratochvil writes: > > Jan> while *.sum files were OK the *.log files sometimes miss the > Jan> content present in *.sum results. For example > Jan> gdb.base/bitfields.exp output was missing while > Jan> gdb.base/bitfields.exp output was present. > > Jan> OK to check-in? (GCC + GDB approval requested) > > This is ok for gdb as well. > Thanks. I see now I would rather sync it with gcc, OK to check in this way? (I should have asked differently in the first place.) Thanks, Jan 2010-03-22 Jan Kratochvil * dg-extract-results.sh: Sync with GCC HEAD (import r155655, r157175 and r157645). --- gdbhead/gdb/testsuite/dg-extract-results.sh 2010-03-08 23:57:02.000000000 +0100 +++ gcchead/contrib/dg-extract-results.sh 2010-03-22 18:35:18.000000000 +0100 @@ -6,7 +6,7 @@ # The resulting file can be used with test result comparison scripts for # results from tests that were run in parallel. See usage() below. -# Copyright (C) 2008, 2009 Free Software Foundation +# Copyright (C) 2008, 2009, 2010 Free Software Foundation # Contributed by Janis Johnson # # This file is part of GCC. @@ -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 @@ -365,8 +365,8 @@ BEGIN { END { printf ("\t\t=== %s Summary for %s ===\n\n", tool, variant) if (passcnt != 0) printf ("# of expected passes\t\t%d\n", passcnt) - if (xpasscnt != 0) printf ("# of unexpected successes\t%d\n", xpasscnt) if (failcnt != 0) printf ("# of unexpected failures\t%d\n", failcnt) + if (xpasscnt != 0) printf ("# of unexpected successes\t%d\n", xpasscnt) if (xfailcnt != 0) printf ("# of expected failures\t\t%d\n", xfailcnt) if (untstcnt != 0) printf ("# of untested testcases\t\t%d\n", untstcnt) if (unrescnt != 0) printf ("# of unresolved testcases\t%d\n", unrescnt) @@ -418,6 +418,6 @@ cat ${TMP}/var-* | $AWK -f $TOTAL_AWK # This is ugly, but if there's version output from the compiler under test # at the end of the file, we want it. The other thing that might be there # is the final summary counts. -tail -n 2 $FIRST_SUM | grep -q '^#' || tail -n 2 $FIRST_SUM +tail -2 $FIRST_SUM | grep -q '^#' || tail -2 $FIRST_SUM exit 0