From patchwork Mon Apr 16 15:03:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 152888 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 7F909B6EF1 for ; Tue, 17 Apr 2012 01:04:13 +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=1335193454; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:From:To:Cc:Subject:Date:Message-ID:User-Agent: MIME-Version:Content-Type:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=Vuz0dn0XaWcFqkjV3BzLBTTdCRg=; b=ppBeSnS1SY9lr5F P+ZFbkx0AjZew5m1lMDBpQ0UBrJOiKcgbkDTcfBRDtLe46j06CMSGOp/Z1lHhJjp xqAPVMX8JCWKaKhw8Hy05e7nJxHvy+Y4W2Rtp8Bhdu+7hMeTpJfsWbIPtDR9mtho UGyAAdXwdhX3SrTxP9hKCQZw/73o= 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:Received:From:To:Cc:Subject:Date:Message-ID:User-Agent:MIME-Version:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=pNDMFMFHWKPHyxLPA5ukeYzFDfY4aOyU/EqDiT/P95YBwCy6RooLAd+Ww9dSEK 4ky5ybop3OATHQ/XPItpMmWous6lwlZ/+vCARdmN3Hp8zKld8cM7S4FQghRdsIpB G/zcl9z/q1aiAf/t3rMQwD7ugGLjEEt4vYRePq0g9dWmo=; Received: (qmail 31686 invoked by alias); 16 Apr 2012 15:04:01 -0000 Received: (qmail 31667 invoked by uid 22791); 16 Apr 2012 15:04:00 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD, T_TVD_MIME_NO_HEADERS X-Spam-Check-By: sourceware.org Received: from snape.CeBiTec.Uni-Bielefeld.DE (HELO smtp-relay.CeBiTec.Uni-Bielefeld.DE) (129.70.160.84) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 16 Apr 2012 15:03:30 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id D447F338; Mon, 16 Apr 2012 17:03:28 +0200 (CEST) Received: from smtp-relay.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (malfoy.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) (amavisd-new, port 10024) with LMTP id UafhzCIcgwAP; Mon, 16 Apr 2012 17:03:26 +0200 (CEST) Received: from manam.CeBiTec.Uni-Bielefeld.DE (manam.CeBiTec.Uni-Bielefeld.DE [129.70.161.120]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPS id 91A08337; Mon, 16 Apr 2012 17:03:26 +0200 (CEST) Received: (from ro@localhost) by manam.CeBiTec.Uni-Bielefeld.DE (8.14.5+Sun/8.14.5/Submit) id q3GF3QvI011914; Mon, 16 Apr 2012 17:03:26 +0200 (MEST) From: Rainer Orth To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Benjamin Kosnik Subject: [v3, testsuite] Fix merging default libstdc++.log Date: Mon, 16 Apr 2012 17:03:25 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (usg-unix-v) MIME-Version: 1.0 X-IsSubscribed: yes 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 I've long noticed that libstdc++.log (unlike libstdc++.sum) doesn't contain log entries for tests run from abi.exp, but hadn't looked closer, getting used to check libstdc++.log.sep instead which contained everything I expected. This weekend, I've observed the same for the prettyprinters.exp failures reported in PR libstdc++/53006 and decided to investigate. It turns out that abi_check is the culprit: it emits its own summary in a style similar to what DejaGnu does: === libstdc++-v3 check-abi Summary === # of added symbols: 0 # of missing symbols: 0 # of undesignated symbols: 0 # of incompatible symbols: 0 using: baseline_symbols.txt The header format is similar to what runtest emits, but the detail lines below are completely different. This is enought to seriously confuse contrib/dg-extract-results.sh -L badly enough to assume that this header line ends one variant, which otherwise only happens when doing multilib testing with intermediate summaries like === libstdc++ Summary for unix === # of expected passes 50 === libstdc++ Summary for unix/-m64 === # of expected passes 49 # of unexpected failures 1 My (admittedly equally hacky solution) was to change the check-abi header format enough to avoid this confusion, and suddently the expected abi.exp and prettyprinters.exp log entries show up in the merged libstdc++.log as expected. Bootstrapped on i386-pc-solaris2.11, ok for mainline? Thanks. Rainer 2012-04-15 Rainer Orth * testsuite/util/testsuite_abi.cc (compare_symbols): Change summary header to avoid confision with DejaGnu header. # HG changeset patch # Parent 5fef8c66380e7570ac7c7a2b4b5aa94646c6bba4 Fix merging default libstdc++.log diff --git a/libstdc++-v3/testsuite/util/testsuite_abi.cc b/libstdc++-v3/testsuite/util/testsuite_abi.cc --- a/libstdc++-v3/testsuite/util/testsuite_abi.cc +++ b/libstdc++-v3/testsuite/util/testsuite_abi.cc @@ -530,7 +530,7 @@ compare_symbols(const char* baseline_fil } } - cout << "\n\t\t=== libstdc++-v3 check-abi Summary ===" << endl; + cout << "\n\t\t==== libstdc++-v3 check-abi Summary ====" << endl; cout << endl; cout << "# of added symbols:\t\t " << added_names.size() << endl; cout << "# of missing symbols:\t\t " << missing_names.size() << endl;