2010-06-01  Michael Snyder  <msnyder@vmware.com>

	* gdb.cp/class2.exp: Use gdb_test_no_output.
	* gdb.cp/classes.exp: Ditto.
	* gdb.cp/extern-c.exp: Ditto.
	* gdb.cp/inherit.exp: Ditto.
	* gdb.cp/maint.exp: Ditto.
	* gdb.cp/mb-inline.exp: Ditto.
	* gdb.cp/mb-templates.exp: Ditto.
	* gdb.cp/method2.exp: Ditto.
	* gdb.cp/misc.exp: Ditto.
	* gdb.cp/ovldbreak.exp: Ditto.
	* gdb.cp/punctuator.exp: Ditto.
	* gdb.cp/templates.exp: Ditto.
	* gdb.cp/virtbase.exp: Ditto.

Index: class2.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.cp/class2.exp,v
retrieving revision 1.11
diff -u -p -r1.11 class2.exp
--- class2.exp	5 May 2010 18:06:58 -0000	1.11
+++ class2.exp	1 Jun 2010 21:33:10 -0000
@@ -42,7 +42,7 @@ gdb_load ${binfile}
 
 # Start with "set print object off".
 
-gdb_test "set print object off" ""
+gdb_test_no_output "set print object off"
 
 if ![runto_main] then {
     perror "couldn't run to main"
@@ -118,7 +118,7 @@ gdb_test "p e" "= \{<No data fields>\}" 
 
 # Printing NULL pointers with "set print object on"
 
-gdb_test "set print object on" ""
+gdb_test_no_output "set print object on"
 gdb_test "p acp" "= \\(C \\*\\) ${hex}"
 gdb_test "p acp->c1" "\\(A \\*\\) 0x0"
 gdb_test "p acp->c2" "\\(A \\*\\) ${hex}f"
Index: classes.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.cp/classes.exp,v
retrieving revision 1.25
diff -u -p -r1.25 classes.exp
--- classes.exp	5 May 2010 18:06:58 -0000	1.25
+++ classes.exp	1 Jun 2010 21:33:10 -0000
@@ -528,7 +528,7 @@ proc test_static_members {} {
     gdb_test "print &Bar::st" "\\$\[0-9\]+ = \\(int ?\\*\\) $hex"
     gdb_test "print *\$" "\\$\[0-9\]+ = 200"
 
-    gdb_test "set print static-members off" ""
+    gdb_test_no_output "set print static-members off"
     gdb_test "print csi" \
 	"{x = 10, y = 20}" \
 	"print csi without static members"
@@ -536,7 +536,7 @@ proc test_static_members {} {
 	"{x = 30, y = 40}" \
 	"print cnsi without static members"
 
-    gdb_test "set print static-members on" ""
+    gdb_test_no_output "set print static-members on"
     gdb_test "print csi" \
 	"{x = 10, y = 20, static null = {x = 0, y = 0, static null = <same as static member of an already seen type>}}" \
 	"print csi with static members"
Index: extern-c.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.cp/extern-c.exp,v
retrieving revision 1.4
diff -u -p -r1.4 extern-c.exp
--- extern-c.exp	1 Apr 2010 14:11:24 -0000	1.4
+++ extern-c.exp	1 Jun 2010 21:33:10 -0000
@@ -40,7 +40,7 @@ if { [gdb_breakpoint "c_func"] == 1 } {
 }
 gdb_continue_to_breakpoint "c_func" ".*c_func.*"
 
-gdb_test "set \$counter = 0" "" "initialize counter"
+gdb_test_no_output "set \$counter = 0" "initialize counter"
 
 gdb_test "rbreak c_funcs" \
     "Breakpoint.* at .*c_funcs_1.*Breakpoint.* at .*c_funcs_2.*"
Index: inherit.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.cp/inherit.exp,v
retrieving revision 1.18
diff -u -p -r1.18 inherit.exp
--- inherit.exp	5 May 2010 18:06:58 -0000	1.18
+++ inherit.exp	1 Jun 2010 21:33:10 -0000
@@ -728,8 +728,8 @@ proc do_tests { } {
     gdb_reinitialize_dir $srcdir/$subdir
     gdb_load $binfile
 
-    gdb_test "set language c++" ""
-    gdb_test "set width 0" ""
+    gdb_test_no_output "set language c++"
+    gdb_test_no_output "set width 0"
 
     if { ![runto_main] } then {
 	perror "couldn't run to main"
Index: maint.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.cp/maint.exp,v
retrieving revision 1.6
diff -u -p -r1.6 maint.exp
--- maint.exp	23 Aug 2007 18:14:17 -0000	1.6
+++ maint.exp	1 Jun 2010 21:33:10 -0000
@@ -62,7 +62,7 @@ proc test_first_component {} {
     # The function in question might complain; make sure that we see
     # all complaints.
 
-    gdb_test "set complaints 1000" ""
+    gdb_test_no_output "set complaints 1000"
 
     test_single_component "foo"
     test_single_component "operator<<"
Index: mb-inline.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.cp/mb-inline.exp,v
retrieving revision 1.5
diff -u -p -r1.5 mb-inline.exp
--- mb-inline.exp	5 May 2010 18:06:58 -0000	1.5
+++ mb-inline.exp	1 Jun 2010 21:33:10 -0000
@@ -86,7 +86,7 @@ gdb_test "continue" \
 # that at least in simple cases, the enable/disable
 # state of locations survive "run".
 # Early bug would disable 1.1 and enable 1.2 when program is run.
-gdb_test "disable 1.2" "" "disabling location: disable"
+gdb_test_no_output "disable 1.2" "disabling location: disable"
 
 gdb_run_cmd
 gdb_expect {
Index: mb-templates.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.cp/mb-templates.exp,v
retrieving revision 1.9
diff -u -p -r1.9 mb-templates.exp
--- mb-templates.exp	5 May 2010 18:06:58 -0000	1.9
+++ mb-templates.exp	1 Jun 2010 21:33:10 -0000
@@ -83,7 +83,7 @@ gdb_test "break $srcfile:$bp_location" \
     "Breakpoint.*at.* file .*$srcfile, line.*\\(2 locations\\).*" \
     "separate condition: set breakpoint"
 
-gdb_test "condition 1 i==1" "" \
+gdb_test_no_output "condition 1 i==1" \
     "separate condition: set condition"
     
 gdb_run_cmd
@@ -106,7 +106,7 @@ gdb_test "continue" \
 # Try disabling a single location. We also test
 # that at least in simple cases, the enable/disable
 # state of locations surive "run".
-gdb_test "disable 1.1" "" "disabling location: disable"
+gdb_test_no_output "disable 1.1" "disabling location: disable"
 
 gdb_run_cmd
 gdb_expect {
@@ -122,10 +122,10 @@ gdb_expect {
 }
 
 # Try disabling entire breakpoint
-gdb_test "enable 1.1" "" "disabling location: enable"
+gdb_test_no_output "enable 1.1" "disabling location: enable"
 
 
-gdb_test "disable 1" "" "disable breakpoint: disable"
+gdb_test_no_output "disable 1" "disable breakpoint: disable"
 
 gdb_run_cmd
 gdb_expect {
Index: method2.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.cp/method2.exp,v
retrieving revision 1.7
diff -u -p -r1.7 method2.exp
--- method2.exp	1 Jan 2010 07:32:01 -0000	1.7
+++ method2.exp	1 Jun 2010 21:33:10 -0000
@@ -62,7 +62,7 @@ proc test_break { lang } {
 # We want in this test to double-check the contents of the multiple-choice
 # menu that's printed when a breakpoint location is ambiguous.  So we need
 # to set multiple-symbols to "ask" first.
-gdb_test "set multiple-symbols ask" ""
+gdb_test_no_output "set multiple-symbols ask"
 
 test_break "c"
 test_break "c++"
Index: misc.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.cp/misc.exp,v
retrieving revision 1.10
diff -u -p -r1.10 misc.exp
--- misc.exp	1 Jun 2010 18:18:35 -0000	1.10
+++ misc.exp	1 Jun 2010 21:33:10 -0000
@@ -58,7 +58,7 @@ proc test_expr { args } {
     }
     set last_ent [expr [llength $args] - 1];
     set testname [lindex $args $last_ent];
-    if [gdb_test [lindex $args 0] "" "$testname (setup)"] {
+    if [gdb_test_no_output [lindex $args 0] "$testname (setup)"] {
 	gdb_suppress_tests;
     }
     for {set x 1} {$x < $last_ent} {set x [expr $x + 2]} {
Index: ovldbreak.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.cp/ovldbreak.exp,v
retrieving revision 1.15
diff -u -p -r1.15 ovldbreak.exp
--- ovldbreak.exp	1 Jun 2010 18:18:35 -0000	1.15
+++ ovldbreak.exp	1 Jun 2010 21:33:10 -0000
@@ -146,7 +146,7 @@ append menu_overload1arg "> $"
 
 # Set multiple-symbols to "ask", to allow us to test the use
 # of the multiple-choice menu when breaking on an overloaded method.
-gdb_test "set multiple-symbols ask" ""
+gdb_test_no_output "set multiple-symbols ask"
 
 # Set breakpoints on foo::overload1arg, one by one.
 
@@ -367,13 +367,13 @@ continue_to_bp_overloaded 1 14 "double" 
 
 # Test breaking on an overloaded function when multiple-symbols
 # is set to "cancel"
-gdb_test "set multiple-symbols cancel" ""
+gdb_test_no_output "set multiple-symbols cancel"
 gdb_test "break foo::foofunc" \
          "canceled.*"
 
 # Test breaking on an overloaded function when multiple-symbols
 # is set to "all"
-gdb_test "set multiple-symbols all" ""
+gdb_test_no_output "set multiple-symbols all"
 gdb_test "break foo::foofunc" \
          "Breakpoint \[0-9\]+ at ${hex}: file .*ovldbreak\\.cc, line \[0-9\]+\\.\r\nBreakpoint \[0-9\]+ at ${hex}: file .*ovldbreak\\.cc, line \[0-9\]+\\.\r\nwarning: Multiple breakpoints were set\\.\r\nUse the \"delete\" command to delete unwanted breakpoints\\."
 
Index: punctuator.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.cp/punctuator.exp,v
retrieving revision 1.4
diff -u -p -r1.4 punctuator.exp
--- punctuator.exp	1 Jan 2010 07:32:01 -0000	1.4
+++ punctuator.exp	1 Jun 2010 21:33:10 -0000
@@ -26,7 +26,7 @@ if { [skip_cplus_tests] } { continue }
 gdb_exit
 gdb_start
 
-gdb_test "set lang c++" ""
+gdb_test_no_output "set lang c++"
 gdb_test "print (0x5a5a bitand 0xaaaa) == (0x5a5a & 0xaaaa)" " = true"
 gdb_test "print (0x5a5a bitor 0xaaaa) == (0x5a5a | 0xaaaa)" " = true"
 gdb_test "print (0x5a5a xor 0xaaaa) == (0x5a5a ^ 0xaaaa)" " = true"
@@ -35,17 +35,17 @@ gdb_test "print (0x5a5a or 0xaaaa) == (0
 gdb_test "print (not not 0xaaaa) == (!!0xaaaa)" " = true"
 gdb_test "print (compl 0xaaaa) == (~0xaaaa)" " = true"
 
-gdb_test "set \$u = 0x5a5a" ""
-gdb_test "set \$v = 0x5a5a" ""
+gdb_test_no_output "set \$u = 0x5a5a" "set \$u 1"
+gdb_test_no_output "set \$v = 0x5a5a" "set \$v 1"
 gdb_test "print (\$u not_eq 0xaaaa) == (\$v != 0xaaaa)" "= true"
 gdb_test "print (\$u and_eq 0xaaaa) == (\$v &= 0xaaaa)" "= true"
 
-gdb_test "set \$u = 0x5a5a" ""
-gdb_test "set \$v = 0x5a5a" ""
+gdb_test_no_output "set \$u = 0x5a5a" "set \$u 2"
+gdb_test_no_output "set \$v = 0x5a5a" "set \$v 2"
 gdb_test "print (\$u or_eq 0xaaaa) == (\$v |= 0xaaaa)" "= true"
 
-gdb_test "set \$u = 0x5a5a" ""
-gdb_test "set \$v = 0x5a5a" ""
+gdb_test_no_output "set \$u = 0x5a5a" "set \$u 3"
+gdb_test_no_output "set \$v = 0x5a5a" "set \$v 3"
 gdb_test "print (\$u xor_eq 0xaaaa) == (\$v ^= 0xaaaa)" "= true"
 
 gdb_exit
Index: templates.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.cp/templates.exp,v
retrieving revision 1.25
diff -u -p -r1.25 templates.exp
--- templates.exp	1 Jun 2010 18:18:35 -0000	1.25
+++ templates.exp	1 Jun 2010 21:33:10 -0000
@@ -213,7 +213,7 @@ proc do_tests {} {
 
     # Change multiple-symbols to "ask" in order to get the multiple-choice
     # menu when breaking on overloaded methods.
-    gdb_test "set multiple-symbols ask" ""
+    gdb_test_no_output "set multiple-symbols ask"
 
     runto_main
 
Index: virtbase.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.cp/virtbase.exp,v
retrieving revision 1.3
diff -u -p -r1.3 virtbase.exp
--- virtbase.exp	4 Feb 2010 21:04:30 -0000	1.3
+++ virtbase.exp	1 Jun 2010 21:33:10 -0000
@@ -58,5 +58,5 @@ gdb_test "print *(D *) e" " = {<C> = {v 
 
 # A regression test reported to Red Hat bugzilla, see:
 # https://bugzilla.redhat.com/show_bug.cgi?id=560741
-gdb_test "set print object on" ""
+gdb_test_no_output "set print object on"
 gdb_test "print/x b->mA" " = 0xaaaaaaaa"