From 1cf0e11f28bc97fd0181394abb78acf65d845be3 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Fri, 5 Aug 2011 09:41:27 +0000 Subject: [PATCH] gdb/testsuite/ * gdb.base/callfuncs.exp: Set language after main. * gdb.cp/cplusfuncs.exp: Likewise. * gdb.cp/inherit.exp: Likewise. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.base/callfuncs.exp | 2 +- gdb/testsuite/gdb.cp/cplusfuncs.exp | 2 +- gdb/testsuite/gdb.cp/inherit.exp | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 532f59f9ff..8ee5b93e73 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2011-08-05 Yao Qi + + * gdb.base/callfuncs.exp: Set language after main. + * gdb.cp/cplusfuncs.exp: Likewise. + * gdb.cp/inherit.exp: Likewise. + 2011-08-04 Ulrich Weigand * gdb.base/nostdlib.exp: Skip on gdb_stub targets. diff --git a/gdb/testsuite/gdb.base/callfuncs.exp b/gdb/testsuite/gdb.base/callfuncs.exp index 78e6dd2454..638c569054 100644 --- a/gdb/testsuite/gdb.base/callfuncs.exp +++ b/gdb/testsuite/gdb.base/callfuncs.exp @@ -338,10 +338,10 @@ proc rerun_and_prepare {} { gdb_test_no_output "set overload-resolution 0" } else { - gdb_test_no_output "set language c" if { ![runto_main] } { gdb_suppress_tests; } + gdb_test_no_output "set language c" } get_debug_format diff --git a/gdb/testsuite/gdb.cp/cplusfuncs.exp b/gdb/testsuite/gdb.cp/cplusfuncs.exp index f075352598..8bfddc0d71 100644 --- a/gdb/testsuite/gdb.cp/cplusfuncs.exp +++ b/gdb/testsuite/gdb.cp/cplusfuncs.exp @@ -603,11 +603,11 @@ proc do_tests {} { gdb_reinitialize_dir $srcdir/$subdir gdb_load $binfile - gdb_test_no_output "set language c++" gdb_test_no_output "set width 0" runto_main + gdb_test_no_output "set language c++" probe_demangler test_paddr_overloaded_functions test_paddr_operator_functions diff --git a/gdb/testsuite/gdb.cp/inherit.exp b/gdb/testsuite/gdb.cp/inherit.exp index c353394082..add75365da 100644 --- a/gdb/testsuite/gdb.cp/inherit.exp +++ b/gdb/testsuite/gdb.cp/inherit.exp @@ -728,7 +728,6 @@ proc do_tests { } { gdb_reinitialize_dir $srcdir/$subdir gdb_load $binfile - gdb_test_no_output "set language c++" gdb_test_no_output "set width 0" if { ![runto_main] } then { @@ -736,6 +735,7 @@ proc do_tests { } { return } + gdb_test_no_output "set language c++" test_ptype_si test_ptype_mi test_ptype_vi