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
+       }
     }
 }
 
-- 
1.8.0.1

-- 
Andreas Schwab, sch...@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Reply via email to