From 0a600c36f72abbc5455ca6d898ff8ddfbbad7884 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Wed, 30 Jun 2010 15:58:47 +0000 Subject: [PATCH] gdb/testsuite/ * gdb.cp/namespace.exp (print C::OtherFileClass::cOtherFileClassVar) (print ::C::OtherFileClass::cOtherFileClassVar): Remove KFAIL for c++/11702. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.cp/namespace.exp | 23 ++--------------------- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 083dcf9e89..34c9542861 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2010-06-30 Jan Kratochvil + + * gdb.cp/namespace.exp (print C::OtherFileClass::cOtherFileClassVar) + (print ::C::OtherFileClass::cOtherFileClassVar): Remove KFAIL for + c++/11702. + 2010-06-29 Jan Kratochvil Doug Evans diff --git a/gdb/testsuite/gdb.cp/namespace.exp b/gdb/testsuite/gdb.cp/namespace.exp index 1eae62f2d6..0dcd398f14 100644 --- a/gdb/testsuite/gdb.cp/namespace.exp +++ b/gdb/testsuite/gdb.cp/namespace.exp @@ -186,17 +186,7 @@ if {[test_compiler_info {gcc-[0-3]-*}] setup_xfail *-*-* } gdb_test "whatis ::C::OtherFileClass::cOtherFileClassType" "type = short" - -set test "print C::OtherFileClass::cOtherFileClassVar" -gdb_test_multiple $test $test { - -re "\\$\[0-9\].* = 318\r\n$gdb_prompt $" { - pass $test - } - -re "static field cOtherFileClassVar has been optimized out\r\n$gdb_prompt $" { - setup_kfail "c++/11702" "*-*-*" - fail $test - } -} +gdb_test "print C::OtherFileClass::cOtherFileClassVar" " = 318" # FSF GCC <=4.4 creates unqualified DIE "cOtherFileClassVar" ignoring the # namespace the same way older GDB did. @@ -206,16 +196,7 @@ gdb_test_multiple $test $test { -re "No symbol \"cOtherFileClassVar\" in current context\\.\r\n$gdb_prompt $" { pass $test - gdb_test_multiple $test2 $test2 { - -re "\\$\[0-9\].* = 318\r\n$gdb_prompt $" { - pass $test2 - } - -re "static field cOtherFileClassVar has been optimized out\r\n$gdb_prompt $" { - setup_kfail "c++/11702" "*-*-*" - fail $test2 - } - } - + gdb_test $test2 " = 318" } -re "\\$\[0-9\].* = 318\r\n$gdb_prompt $" { if {[test_compiler_info {gcc-[0-3]-*}] -- 2.34.1