2010-06-02 Michael Snyder * gdb.dwarf2/dw2-basic.exp: Use gdb_test_no_output. * gdb.dwarf2/dw2-compressed.exp: Ditto. * gdb.dwarf2/dw2-intercu.exp: Ditto. * gdb.dwarf2/dw2-intermix.exp: Ditto. * gdb.dwarf2/dw2-producer.exp: Ditto. * gdb.dwarf2/mac-fileno.exp: Ditto. * gdb.gdb/observer.exp: Use gdb_test_no_output. * gdb.gdb/selftest.exp: Ditto. * gdb.multi/base.exp: Use gdb_test_no_output. * gdb.opt/inline-cmds.exp: Use gdb_test_no_output. Index: gdb.dwarf2/dw2-basic.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.dwarf2/dw2-basic.exp,v retrieving revision 1.9 diff -u -p -r1.9 dw2-basic.exp --- gdb.dwarf2/dw2-basic.exp 1 Jan 2010 07:32:02 -0000 1.9 +++ gdb.dwarf2/dw2-basic.exp 2 Jun 2010 20:09:06 -0000 @@ -50,7 +50,7 @@ gdb_load ${binfile} set remote_dwarf_srcfile [remote_download host ${srcdir}/${subdir}/${dwarf_srcfile}] -gdb_test "set listsize 1" "" +gdb_test_no_output "set listsize 1" gdb_test "list func_cu1" "4\[ \t\]+File 1 Line 4" gdb_test "ptype func_cu1" "type = int \\(\\)" Index: gdb.dwarf2/dw2-compressed.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp,v retrieving revision 1.4 diff -u -p -r1.4 dw2-compressed.exp --- gdb.dwarf2/dw2-compressed.exp 1 Jan 2010 07:32:02 -0000 1.4 +++ gdb.dwarf2/dw2-compressed.exp 2 Jun 2010 20:09:06 -0000 @@ -50,7 +50,7 @@ gdb_load ${binfile} set remote_dwarf_srcfile [remote_download host ${srcdir}/${subdir}/${dwarf_srcfile}] -gdb_test "set listsize 1" "" +gdb_test_no_output "set listsize 1" gdb_test "list func_cu1" "4\[ \t\]+File 1 Line 4" gdb_test "ptype func_cu1" "type = int \\(\\)" Index: gdb.dwarf2/dw2-intercu.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp,v retrieving revision 1.8 diff -u -p -r1.8 dw2-intercu.exp --- gdb.dwarf2/dw2-intercu.exp 1 Jan 2010 07:32:02 -0000 1.8 +++ gdb.dwarf2/dw2-intercu.exp 2 Jun 2010 20:09:06 -0000 @@ -50,7 +50,7 @@ gdb_load ${binfile} set remote_dwarf_srcfile [remote_download host ${srcdir}/${subdir}/${dwarf_srcfile}] -gdb_test "set listsize 1" "" +gdb_test_no_output "set listsize 1" gdb_test "list func_cu1" "4\[ \t\]+File 1 Line 4" gdb_test "ptype func_cu1" "type = int \\(\\)" Index: gdb.dwarf2/dw2-intermix.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp,v retrieving revision 1.7 diff -u -p -r1.7 dw2-intermix.exp --- gdb.dwarf2/dw2-intermix.exp 1 Jan 2010 07:32:02 -0000 1.7 +++ gdb.dwarf2/dw2-intermix.exp 2 Jun 2010 20:09:06 -0000 @@ -50,7 +50,7 @@ gdb_load ${binfile} set remote_dwarf_srcfile [remote_download host ${srcdir}/${subdir}/${dwarf_srcfile}] -gdb_test "set listsize 1" "" +gdb_test_no_output "set listsize 1" gdb_test "list func_cu1" "4\[ \t\]+File 1 Line 4" gdb_test "ptype func_cu1" "type = int \\(\\)" Index: gdb.dwarf2/dw2-producer.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.dwarf2/dw2-producer.exp,v retrieving revision 1.6 diff -u -p -r1.6 dw2-producer.exp --- gdb.dwarf2/dw2-producer.exp 1 Jan 2010 07:32:02 -0000 1.6 +++ gdb.dwarf2/dw2-producer.exp 2 Jun 2010 20:09:06 -0000 @@ -48,7 +48,7 @@ gdb_load ${binfile} set remote_dwarf_srcfile [remote_download host ${srcdir}/${subdir}/${dwarf_srcfile}] -gdb_test "set listsize 1" "" +gdb_test_no_output "set listsize 1" gdb_test "list func_cu1" "4\[ \t\]+File 1 Line 4" gdb_test "ptype func_cu1" "type = int \\(\\)" Index: gdb.dwarf2/mac-fileno.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.dwarf2/mac-fileno.exp,v retrieving revision 1.7 diff -u -p -r1.7 mac-fileno.exp --- gdb.dwarf2/mac-fileno.exp 1 Jan 2010 07:32:02 -0000 1.7 +++ gdb.dwarf2/mac-fileno.exp 2 Jun 2010 20:09:06 -0000 @@ -51,7 +51,7 @@ gdb_load ${binfile} set remote_dwarf_srcfile [remote_download host ${srcdir}/${subdir}/${dwarf_srcfile}] -gdb_test "set listsize 1" "" +gdb_test_no_output "set listsize 1" gdb_test "list func_cu1" "4\[ \t\]+File 1 Line 4" gdb_test "ptype func_cu1" "type = int \\(\\)" Index: gdb.gdb/observer.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.gdb/observer.exp,v retrieving revision 1.15 diff -u -p -r1.15 observer.exp --- gdb.gdb/observer.exp 5 May 2010 18:07:00 -0000 1.15 +++ gdb.gdb/observer.exp 2 Jun 2010 20:09:06 -0000 @@ -99,33 +99,33 @@ proc setup_test { executable } { } proc attach_first_observer { message } { - gdb_test "set \$first_obs = observer_attach_test_notification (&observer_test_first_notification_function)" \ - "" "$message; attach first observer" + gdb_test_no_output "set \$first_obs = observer_attach_test_notification (&observer_test_first_notification_function)" \ + "$message; attach first observer" } proc attach_second_observer { message } { - gdb_test "set \$second_obs = observer_attach_test_notification (&observer_test_second_notification_function)" \ - "" "$message; attach second observer" + gdb_test_no_output "set \$second_obs = observer_attach_test_notification (&observer_test_second_notification_function)" \ + "$message; attach second observer" } proc attach_third_observer { message } { - gdb_test "set \$third_obs = observer_attach_test_notification (&observer_test_third_notification_function)" \ - "" "$message; attach third observer" + gdb_test_no_output "set \$third_obs = observer_attach_test_notification (&observer_test_third_notification_function)" \ + "$message; attach third observer" } proc detach_first_observer { message } { - gdb_test "call observer_detach_test_notification (\$first_obs)" \ - "" "$message; detach first observer" + gdb_test_no_output "call observer_detach_test_notification (\$first_obs)" \ + "$message; detach first observer" } proc detach_second_observer { message } { - gdb_test "call observer_detach_test_notification (\$second_obs)" \ - "" "$message; detach second observer" + gdb_test_no_output "call observer_detach_test_notification (\$second_obs)" \ + "$message; detach second observer" } proc detach_third_observer { message } { - gdb_test "call observer_detach_test_notification (\$third_obs)" \ - "" "$message; detach third observer" + gdb_test_no_output "call observer_detach_test_notification (\$third_obs)" \ + "$message; detach third observer" } proc check_counters { first second third message } { @@ -141,11 +141,11 @@ proc check_counters { first second third } proc reset_counters { message } { - gdb_test "set variable observer_test_first_observer = 0" "" \ + gdb_test_no_output "set variable observer_test_first_observer = 0" \ "$message; reset first observer counter" - gdb_test "set variable observer_test_second_observer = 0" "" \ + gdb_test_no_output "set variable observer_test_second_observer = 0" \ "$message; reset second observer counter" - gdb_test "set variable observer_test_third_observer = 0" "" \ + gdb_test_no_output "set variable observer_test_third_observer = 0" \ "$message; reset third observer counter" } @@ -158,7 +158,7 @@ proc test_notifications { first second t # Call observer_notify_test_notification. Note that this procedure # takes one argument, but this argument is ignored by the observer # callbacks we have installed. So we just pass an arbitrary value. - gdb_test "call observer_notify_test_notification (0)" "" \ + gdb_test_no_output "call observer_notify_test_notification (0)" \ "$message; sending notification" check_counters $first $second $third $message } Index: gdb.gdb/selftest.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.gdb/selftest.exp,v retrieving revision 1.20 diff -u -p -r1.20 selftest.exp --- gdb.gdb/selftest.exp 26 May 2010 18:31:25 -0000 1.20 +++ gdb.gdb/selftest.exp 2 Jun 2010 20:09:06 -0000 @@ -299,7 +299,7 @@ proc test_with_self { executable } { # FIXME: If we put this after the run to main, the first list # command doesn't print the same line as the current line where # gdb is stopped. - gdb_test "set listsize 1" "" "set listsize to 1" + gdb_test_no_output "set listsize 1" "set listsize to 1" # run yourself # It may take a very long time for the inferior gdb to start (lynx), Index: gdb.multi/base.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.multi/base.exp,v retrieving revision 1.3 diff -u -p -r1.3 base.exp --- gdb.multi/base.exp 1 Jan 2010 07:32:04 -0000 1.3 +++ gdb.multi/base.exp 2 Jun 2010 20:09:06 -0000 @@ -73,7 +73,7 @@ gdb_test "info functions commonfun" "${s gdb_test "inferior 1" -gdb_test "set listsize 1" "" +gdb_test_no_output "set listsize 1" gdb_test "list commonfun" "from hello.*" Index: gdb.opt/inline-cmds.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.opt/inline-cmds.exp,v retrieving revision 1.2 diff -u -p -r1.2 inline-cmds.exp --- gdb.opt/inline-cmds.exp 1 Jan 2010 07:32:04 -0000 1.2 +++ gdb.opt/inline-cmds.exp 2 Jun 2010 20:09:06 -0000 @@ -32,7 +32,7 @@ gdb_start gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} -gdb_test "set listsize 1" "" +gdb_test_no_output "set listsize 1" runto_main