aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/testsuite/ChangeLog6
-rw-r--r--gdb/testsuite/gdb.base/callfuncs.exp2
-rw-r--r--gdb/testsuite/gdb.cp/cplusfuncs.exp2
-rw-r--r--gdb/testsuite/gdb.cp/inherit.exp2
4 files changed, 9 insertions, 3 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 532f59f..8ee5b93 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-05 Yao Qi <yao@codesourcery.com>
+
+ * gdb.base/callfuncs.exp: Set language after main.
+ * gdb.cp/cplusfuncs.exp: Likewise.
+ * gdb.cp/inherit.exp: Likewise.
+
2011-08-04 Ulrich Weigand <ulrich.weigand@linaro.org>
* 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 78e6dd2..638c569 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 f075352..8bfddc0 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 c353394..add7536 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