From 019ebafccd66a364969a7987cedaf96039ce1d54 Mon Sep 17 00:00:00 2001 From: Michael Snyder Date: Wed, 2 Jun 2010 21:46:45 +0000 Subject: [PATCH] 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. --- gdb/testsuite/ChangeLog | 16 +++++++++++ gdb/testsuite/gdb.dwarf2/dw2-basic.exp | 2 +- gdb/testsuite/gdb.dwarf2/dw2-compressed.exp | 2 +- gdb/testsuite/gdb.dwarf2/dw2-intercu.exp | 2 +- gdb/testsuite/gdb.dwarf2/dw2-intermix.exp | 2 +- gdb/testsuite/gdb.dwarf2/dw2-producer.exp | 2 +- gdb/testsuite/gdb.dwarf2/mac-fileno.exp | 2 +- gdb/testsuite/gdb.gdb/observer.exp | 32 ++++++++++----------- gdb/testsuite/gdb.gdb/selftest.exp | 2 +- gdb/testsuite/gdb.multi/base.exp | 2 +- gdb/testsuite/gdb.opt/inline-cmds.exp | 2 +- 11 files changed, 41 insertions(+), 25 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 5d123612eb5..46df34401e0 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,19 @@ +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. + 2010-06-02 Jan Kratochvil * gdb.cp/ref-types.exp (print value of UI): Remove excessive newline. diff --git a/gdb/testsuite/gdb.dwarf2/dw2-basic.exp b/gdb/testsuite/gdb.dwarf2/dw2-basic.exp index 8569db640bb..b11bf256aee 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-basic.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-basic.exp @@ -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 \\(\\)" diff --git a/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp b/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp index 6d724697b6f..23ac9b2a42e 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp @@ -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 \\(\\)" diff --git a/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp b/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp index 7201230e8d5..9094405a5c6 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp @@ -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 \\(\\)" diff --git a/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp b/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp index 26864243c5e..4022cce6dc1 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp @@ -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 \\(\\)" diff --git a/gdb/testsuite/gdb.dwarf2/dw2-producer.exp b/gdb/testsuite/gdb.dwarf2/dw2-producer.exp index 354447ded7e..3edc1fed856 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-producer.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-producer.exp @@ -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 \\(\\)" diff --git a/gdb/testsuite/gdb.dwarf2/mac-fileno.exp b/gdb/testsuite/gdb.dwarf2/mac-fileno.exp index 01159ad3b90..184f585591b 100644 --- a/gdb/testsuite/gdb.dwarf2/mac-fileno.exp +++ b/gdb/testsuite/gdb.dwarf2/mac-fileno.exp @@ -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 \\(\\)" diff --git a/gdb/testsuite/gdb.gdb/observer.exp b/gdb/testsuite/gdb.gdb/observer.exp index ca5854b9abf..fed74a0e7f0 100644 --- a/gdb/testsuite/gdb.gdb/observer.exp +++ b/gdb/testsuite/gdb.gdb/observer.exp @@ -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 message } { } 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 third message args } { # 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 } diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp index d1574bc8801..a448cbcc703 100644 --- a/gdb/testsuite/gdb.gdb/selftest.exp +++ b/gdb/testsuite/gdb.gdb/selftest.exp @@ -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), diff --git a/gdb/testsuite/gdb.multi/base.exp b/gdb/testsuite/gdb.multi/base.exp index 3817edae983..c8a7bf49a6e 100644 --- a/gdb/testsuite/gdb.multi/base.exp +++ b/gdb/testsuite/gdb.multi/base.exp @@ -73,7 +73,7 @@ gdb_test "info functions commonfun" "${srcfile3}.*" gdb_test "inferior 1" -gdb_test "set listsize 1" "" +gdb_test_no_output "set listsize 1" gdb_test "list commonfun" "from hello.*" diff --git a/gdb/testsuite/gdb.opt/inline-cmds.exp b/gdb/testsuite/gdb.opt/inline-cmds.exp index a4e6b69b65e..038d97f471e 100644 --- a/gdb/testsuite/gdb.opt/inline-cmds.exp +++ b/gdb/testsuite/gdb.opt/inline-cmds.exp @@ -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 -- 2.30.2