gdb/testsuite/

        * gdb.base/callfuncs.exp: Set language after main.
        * gdb.cp/cplusfuncs.exp: Likewise.
        * gdb.cp/inherit.exp: Likewise.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 532f59f9ff009a4dea382a8a1adb251253cdf089..8ee5b93e739dae3b7cac594286db710625c98511 100644 (file)
--- 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 78e6dd2454fe56fc3071abd0e939c92fc9515898..638c569054cef7b44855a389e98248966fab9e9d 100644 (file)
--- 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 f075352598529085f175b7b6dc44fc7bbc3a6d45..8bfddc0d71feada7700970534468a2badd7670d0 100644 (file)
--- 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 c353394082f7d94fd97e86c35bf3bf8f884c4ef4..add75365daba8ad271b9dde3295c99ca752fc4fb 100644 (file)
--- 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