From patchwork Sun Dec  9 14:31:58 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Fix scan-assembler in libstdc++ testsuite
Date: Sun, 09 Dec 2012 04:31:58 -0000
From: Andreas Schwab <schwab@linux-m68k.org>
X-Patchwork-Id: 204702
Message-Id: <m2boe370v5.fsf@igel.home>
To: gcc-patches@gcc.gnu.org
Cc: libstdc++@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
+	}
     }
 }