From patchwork Sun Dec 9 14:31:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 204702 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 86F3F2C01FA for ; Mon, 10 Dec 2012 01:32:17 +1100 (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=1355668338; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:Received:From:To:Subject:cc: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=HCXefY4XMCJAtor9sXeuVQflg8A=; b=fTrno0g4nS5LAT7 ISSbSdrTMmGr3Sjl1C458NqLAVz4dIXmQ1cbXi3CWSS+tn7xhRQgfJUY/+lXxh0v HktrAejj6kEaUsoO6WVnNYPnUI/Bx2pv97heUPXoJjFcUKaCltuQgLfucsqia/vr QsaTeDofA27s5h2LMGVRoRldPCZc= 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:X-Auth-Info:Received:Received:From:To:Subject:cc:X-Yow: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; b=FGf1CcuRMr919DGwKSDgMwtRuUQIROqnKDeI1sKTkC6Aj3f0csDEPzwyDc22Z+ iGIb0vDGtr6Qx0eMOO3YIFe8eTj7H1R1ga+pn0J8Ljmsgy3IOx+0+HhZHsUAOTbj eKJPOXd6ZVpSJ71/bHVJ9asGQ+OqxwAPZM5vSYzLlX99o=; Received: (qmail 8741 invoked by alias); 9 Dec 2012 14:32:08 -0000 Received: (qmail 8713 invoked by uid 22791); 9 Dec 2012 14:32:07 -0000 X-SWARE-Spam-Status: No, hits=-2.2 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE X-Spam-Check-By: sourceware.org Received: from mail-out.m-online.net (HELO mail-out.m-online.net) (212.18.0.9) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sun, 09 Dec 2012 14:32:00 +0000 Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3YK8xq3sk5z4KK6k; Sun, 9 Dec 2012 15:31:59 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3YK8xq3Zh8zbbjY; Sun, 9 Dec 2012 15:31:59 +0100 (CET) Received: from mail.mnet-online.de ([192.168.8.180]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id c8yepHlEIPgE; Sun, 9 Dec 2012 15:31:58 +0100 (CET) X-Auth-Info: dsEPEct75iam4GZC1GTdd6UjNvJ643HGpXwOCsXpB1s= Received: from igel.home (ppp-88-217-121-108.dynamic.mnet-online.de [88.217.121.108]) by mail.mnet-online.de (Postfix) with ESMTPA; Sun, 9 Dec 2012 15:31:58 +0100 (CET) Received: by igel.home (Postfix, from userid 501) id 7A5BDCA2C5; Sun, 9 Dec 2012 15:31:58 +0100 (CET) From: Andreas Schwab To: gcc-patches@gcc.gnu.org Subject: Fix scan-assembler in libstdc++ testsuite cc: libstdc++@gcc.gnu.org X-Yow: I'm reporting for duty as a modern person. I want to do the Latin Hustle now! Date: Sun, 09 Dec 2012 15:31:58 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2.90 (gnu/linux) MIME-Version: 1.0 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 testname-for-summary in gcc/testsuite/lib/target-supports-dg.exp caches testname_with_flags and depends on dg-test to reset it after each test source file. The wrapper in the libstdc++ didn't do that, causing dg-scan-assembler to look at the wrong file. Installed as obvious. Andreas. * testsuite/lib/libstdc++.exp (dg-test): Unset testname_with_flags after running the test. diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index b3be88f..10b9738 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -389,15 +389,22 @@ if { [info procs saved-dg-test] == [list] } { proc dg-test { args } { global additional_prunes global errorInfo + global testname_with_flags if { [ catch { eval saved-dg-test $args } errmsg ] } { set saved_info $errorInfo set additional_prunes "" + if [info exists testname_with_flags] { + unset testname_with_flags + } unset_timeout_vars error $errmsg $saved_info } set additional_prunes "" unset_timeout_vars + if [info exists testname_with_flags] { + unset testname_with_flags + } } }