From: Andreas Schwab <schwab@linux-m68k.org>
Date: Sun, 9 Dec 2012 14:31:27 +0000 (+0000)
Subject: libstdc++.exp (dg-test): Unset testname_with_flags after running the test.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9ddad47136de9aa110f48261f7a4f4a9ea088a4e;p=gcc.git

libstdc++.exp (dg-test): Unset testname_with_flags after running the test.

* testsuite/lib/libstdc++.exp (dg-test): Unset testname_with_flags
after running the test.

From-SVN: r194330
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0be692bd520..c478e94b7ae 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-09  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* testsuite/lib/libstdc++.exp (dg-test): Unset testname_with_flags
+	after running the test.
+
 2012-12-04  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* include/Makefile.am (${host_builddir}/c++config.h): Replace
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index b3be88fc5e3..10b97381451 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
+	}
     }
 }