diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2012-12-09 14:31:27 +0000 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2012-12-09 14:31:27 +0000 |
| commit | 45ad435c3ced2642b0441eacd69258c213f89b08 (patch) | |
| tree | 1dee78537fbaf69b6a62cb553ac27709cad170c1 | |
| parent | ca44c613937546472dda1ee39d05c940f7ad53c0 (diff) | |
* testsuite/lib/libstdc++.exp (dg-test): Unset testname_with_flags
after running the test.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@194330 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/lib/libstdc++.exp | 7 |
2 files changed, 12 insertions, 0 deletions
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 + } } } |