From 12b5d08a7553953ab0c089fed79ff3c2e8389457 Mon Sep 17 00:00:00 2001 From: Michael Snyder Date: Wed, 2 Jun 2010 21:53:28 +0000 Subject: [PATCH] 2010-06-02 Michael Snyder * gdb.threads/fork-thread-pending.exp: Use gdb_test_no_output. * gdb.threads/hand-call-in-thraeds.exp: Ditto. * gdb.threads/local-watch-wrong-thread.exp: Ditto. * gdb.threads/manythreads.exp: Ditto. * gdb.threads/print-threads.exp: Ditto. * gdb.threads/pthreads.exp: Ditto. * gdb.threads/schedlock.exp: Ditto. * gdb.threads/staticthreads.exp: Ditto. * gdb.threads/thread-specific.exp: Ditto. * gdb.threads/thread-unwindonsignal.exp: Ditto. * gdb.threads/threadapply.exp: Ditto. * gdb.threads/watchthreads.exp: Ditto. * gdb.threads/watchthreads2.exp: Ditto. --- gdb/testsuite/ChangeLog | 14 +++++++++++++ .../gdb.threads/fork-thread-pending.exp | 4 ++-- .../gdb.threads/hand-call-in-threads.exp | 8 ++++---- .../gdb.threads/local-watch-wrong-thread.exp | 4 ++-- gdb/testsuite/gdb.threads/manythreads.exp | 2 +- gdb/testsuite/gdb.threads/print-threads.exp | 12 +++++------ gdb/testsuite/gdb.threads/pthreads.exp | 20 +++++++++---------- gdb/testsuite/gdb.threads/schedlock.exp | 8 ++++---- gdb/testsuite/gdb.threads/staticthreads.exp | 2 +- gdb/testsuite/gdb.threads/thread-specific.exp | 4 ++-- .../gdb.threads/thread-unwindonsignal.exp | 3 +-- gdb/testsuite/gdb.threads/threadapply.exp | 2 +- gdb/testsuite/gdb.threads/watchthreads.exp | 4 ++-- gdb/testsuite/gdb.threads/watchthreads2.exp | 4 ++-- 14 files changed, 52 insertions(+), 39 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 2a15f3e6621..cf6bab0a0ca 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,19 @@ 2010-06-02 Michael Snyder + * gdb.threads/fork-thread-pending.exp: Use gdb_test_no_output. + * gdb.threads/hand-call-in-thraeds.exp: Ditto. + * gdb.threads/local-watch-wrong-thread.exp: Ditto. + * gdb.threads/manythreads.exp: Ditto. + * gdb.threads/print-threads.exp: Ditto. + * gdb.threads/pthreads.exp: Ditto. + * gdb.threads/schedlock.exp: Ditto. + * gdb.threads/staticthreads.exp: Ditto. + * gdb.threads/thread-specific.exp: Ditto. + * gdb.threads/thread-unwindonsignal.exp: Ditto. + * gdb.threads/threadapply.exp: Ditto. + * gdb.threads/watchthreads.exp: Ditto. + * gdb.threads/watchthreads2.exp: Ditto. + * gdb.python/py-block.exp: Use gdb_test_no_output. * gdb.python/py-prettyprint.exp: Ditto. * gdb.python/py-template.exp: Ditto. diff --git a/gdb/testsuite/gdb.threads/fork-thread-pending.exp b/gdb/testsuite/gdb.threads/fork-thread-pending.exp index 230798a191d..d53ddef8866 100644 --- a/gdb/testsuite/gdb.threads/fork-thread-pending.exp +++ b/gdb/testsuite/gdb.threads/fork-thread-pending.exp @@ -43,7 +43,7 @@ if ![runto_main] then { return 0 } -gdb_test "set follow-fork-mode child" "" "1, set follow-fork-mode child" +gdb_test_no_output "set follow-fork-mode child" "1, set follow-fork-mode child" gdb_test "catch fork" "Catchpoint \[0-9\]* \\(fork\\)" "1, insert fork catchpoint" gdb_breakpoint "start" "" "1, set breakpoint at start" @@ -101,7 +101,7 @@ if ![runto_main] then { return 0 } -gdb_test "set follow-fork-mode child" "" "2, set follow-fork-mode child" +gdb_test_no_output "set follow-fork-mode child" "2, set follow-fork-mode child" gdb_test "catch fork" "Catchpoint \[0-9\]* \\(fork\\)" "2, insert fork catchpoint" gdb_breakpoint "start" diff --git a/gdb/testsuite/gdb.threads/hand-call-in-threads.exp b/gdb/testsuite/gdb.threads/hand-call-in-threads.exp index 572982accef..93383300e34 100644 --- a/gdb/testsuite/gdb.threads/hand-call-in-threads.exp +++ b/gdb/testsuite/gdb.threads/hand-call-in-threads.exp @@ -81,7 +81,7 @@ gdb_test "continue" \ # Before we start making hand function calls, turn on scheduler locking. -gdb_test "set scheduler-locking on" "" "enable scheduler locking" +gdb_test_no_output "set scheduler-locking on" "enable scheduler locking" gdb_test "show scheduler-locking" ".* locking scheduler .* is \"on\"." "show scheduler locking on" # Now hand-call a function in each thread, having the function @@ -100,7 +100,7 @@ for { set i 1 } { $i <= $total_nr_threads } { incr i } { # Now have each hand-called function return. # Turn confirmation off for the "return" command. -gdb_test "set confirm off" "" +gdb_test_no_output "set confirm off" clear_xfail "*-*-*" @@ -133,8 +133,8 @@ gdb_test_multiple "maint print dummy-frames" "all dummies popped" { } } -# Before we resume the full program, turn of scheduler locking. -gdb_test "set scheduler-locking off" "" "disable scheduler locking" +# Before we resume the full program, turn off scheduler locking. +gdb_test_no_output "set scheduler-locking off" "disable scheduler locking" gdb_test "show scheduler-locking" ".* locking scheduler .* is \"off\"." "show scheduler locking off" # Continue one last time, the program should exit normally. diff --git a/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp b/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp index 023619d7fdd..e327fcf9ed0 100644 --- a/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp +++ b/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp @@ -103,7 +103,7 @@ gdb_test "info breakpoints" \ "local watchpoint is still in breakpoint list" # Make the watchpoint condition eval true. -gdb_test "set trigger=1" "" "let local watchpoint trigger" +gdb_test_no_output "set trigger=1" "let local watchpoint trigger" gdb_test "continue" \ "Hardware watchpoint.*Old value.*New value.*thread_function0.*" \ @@ -111,7 +111,7 @@ gdb_test "continue" \ # Confirm that the local watchpoint is indeed deleted when # thread_function0 returns. -gdb_test "set *myp=0" "" "let thread_function0 return" +gdb_test_no_output "set *myp=0" "let thread_function0 return" gdb_test "break ${srcfile}:${bkpt_here}" \ "Breakpoint 6 at .*: file .*${srcfile}, line .*" \ diff --git a/gdb/testsuite/gdb.threads/manythreads.exp b/gdb/testsuite/gdb.threads/manythreads.exp index af15965a377..385cb4b7d52 100644 --- a/gdb/testsuite/gdb.threads/manythreads.exp +++ b/gdb/testsuite/gdb.threads/manythreads.exp @@ -33,7 +33,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executab gdb_start gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} -gdb_test "set print sevenbit-strings" "" +gdb_test_no_output "set print sevenbit-strings" runto_main # We'll need this when we send_gdb a ^C to GDB. Need to do it before we diff --git a/gdb/testsuite/gdb.threads/print-threads.exp b/gdb/testsuite/gdb.threads/print-threads.exp index 1159540443c..4589d522ebc 100644 --- a/gdb/testsuite/gdb.threads/print-threads.exp +++ b/gdb/testsuite/gdb.threads/print-threads.exp @@ -46,9 +46,9 @@ gdb_start gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} -gdb_test "set print sevenbit-strings" "" -#gdb_test "set print address off" "" -gdb_test "set width 0" "" +gdb_test_no_output "set print sevenbit-strings" +#gdb_test_no_output "set print address off" +gdb_test_no_output "set width 0" # We'll need this when we send_gdb a ^C to GDB. Need to do it before we # run the program and gdb starts saving and restoring tty states. @@ -100,17 +100,17 @@ proc test_all_threads { name kill } { runto_main gdb_test "break thread_function" "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*print-threads.c, line \[0-9\]*\\." -gdb_test "set var slow = 0" "" +gdb_test_no_output "set var slow = 0" test_all_threads "fast" 0 runto_main gdb_test "break thread_function" "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*print-threads.c, line \[0-9\]*\\." "break thread_function (2)" -gdb_test "set var slow = 1" "" +gdb_test_no_output "set var slow = 1" test_all_threads "slow" 0 runto_main gdb_test "break thread_function" "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*print-threads.c, line \[0-9\]*\\." "break thread_function (3)" -gdb_test "set var slow = 1" "" "set var slow = 1 (2)" +gdb_test_no_output "set var slow = 1" "set var slow = 1 (2)" gdb_breakpoint "kill" test_all_threads "slow with kill breakpoint" 1 diff --git a/gdb/testsuite/gdb.threads/pthreads.exp b/gdb/testsuite/gdb.threads/pthreads.exp index 0a315cba670..44e3c4ece3c 100644 --- a/gdb/testsuite/gdb.threads/pthreads.exp +++ b/gdb/testsuite/gdb.threads/pthreads.exp @@ -52,9 +52,9 @@ gdb_start gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} -gdb_test "set print sevenbit-strings" "" -#gdb_test "set print address off" "" -gdb_test "set width 0" "" +gdb_test_no_output "set print sevenbit-strings" +#gdb_test_no_output "set print address off" +gdb_test_no_output "set width 0" # We'll need this when we send_gdb a ^C to GDB. Need to do it before we # run the program and gdb starts saving and restoring tty states. @@ -69,14 +69,14 @@ proc all_threads_running {} { global srcfile # Reset all the counters to zero. - gdb_test "set var common_routine::hits=0" "" - gdb_test "set var common_routine::from_thread1=0" "" - gdb_test "set var common_routine::from_thread2=0" "" - gdb_test "set var common_routine::from_main=0" "" - gdb_test "set var common_routine::full_coverage=0" "" + gdb_test_no_output "set var common_routine::hits=0" + gdb_test_no_output "set var common_routine::from_thread1=0" + gdb_test_no_output "set var common_routine::from_thread2=0" + gdb_test_no_output "set var common_routine::from_main=0" + gdb_test_no_output "set var common_routine::full_coverage=0" # Disable all breakpoints. - gdb_test "disable" "" + gdb_test_no_output "disable" # Set up a breakpoint that will cause us to stop when we have # been called 15 times. This should be plenty of time to allow @@ -173,7 +173,7 @@ proc test_startup {} { gdb_test "continue" \ "Continuing.*Breakpoint .*, thread1 \\(arg=0xfeedface\\).*at.*$srcfile.*" \ "Continue to creation of first thread" - gdb_test "disable" "" + gdb_test_no_output "disable" # Extract the thread id number of thread 1 from "info threads" output. gdb_test_multiple "info threads" "get thread 1 id" { diff --git a/gdb/testsuite/gdb.threads/schedlock.exp b/gdb/testsuite/gdb.threads/schedlock.exp index 5a3ab5b62e4..0bdabf5e197 100644 --- a/gdb/testsuite/gdb.threads/schedlock.exp +++ b/gdb/testsuite/gdb.threads/schedlock.exp @@ -145,8 +145,8 @@ if ![istarget "*-*-ultrix*"] then { gdb_load ${binfile} -gdb_test "set print sevenbit-strings" "" -gdb_test "set width 0" "" +gdb_test_no_output "set print sevenbit-strings" +gdb_test_no_output "set width 0" runto_main @@ -199,7 +199,7 @@ set curthread [get_current_thread "find current thread (1)"] # Test stepping without scheduler locking. -gdb_test "set scheduler-locking off" "" +gdb_test_no_output "set scheduler-locking off" step_ten_loops "unlocked" @@ -239,7 +239,7 @@ if {$num_other_threads > 0} { } # Test continue with scheduler locking -gdb_test "set scheduler-locking on" "" +gdb_test "set scheduler-locking on" "" my_continue "with lock" diff --git a/gdb/testsuite/gdb.threads/staticthreads.exp b/gdb/testsuite/gdb.threads/staticthreads.exp index 06b576cce48..67f43f883ea 100644 --- a/gdb/testsuite/gdb.threads/staticthreads.exp +++ b/gdb/testsuite/gdb.threads/staticthreads.exp @@ -38,7 +38,7 @@ if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \ gdb_start gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} -gdb_test "set print sevenbit-strings" "" +gdb_test_no_output "set print sevenbit-strings" # See if the static multi-threaded program runs. diff --git a/gdb/testsuite/gdb.threads/thread-specific.exp b/gdb/testsuite/gdb.threads/thread-specific.exp index 50feac4359a..623d805bd86 100644 --- a/gdb/testsuite/gdb.threads/thread-specific.exp +++ b/gdb/testsuite/gdb.threads/thread-specific.exp @@ -72,8 +72,8 @@ gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} -gdb_test "set print sevenbit-strings" "" -gdb_test "set width 0" "" +gdb_test_no_output "set print sevenbit-strings" +gdb_test_no_output "set width 0" runto_main diff --git a/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp b/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp index a8c91af183e..45be253700f 100644 --- a/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp +++ b/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp @@ -66,8 +66,7 @@ gdb_test "continue" \ # Do turn on unwindonsignal. # We want to test gdb handling of the current thread changing when # unwindonsignal is in effect. -gdb_test "set unwindonsignal on" \ - "" \ +gdb_test_no_output "set unwindonsignal on" \ "setting unwindonsignal" gdb_test "show unwindonsignal" \ "Unwinding of stack .* is on." \ diff --git a/gdb/testsuite/gdb.threads/threadapply.exp b/gdb/testsuite/gdb.threads/threadapply.exp index bdf41c32cae..5982455b513 100644 --- a/gdb/testsuite/gdb.threads/threadapply.exp +++ b/gdb/testsuite/gdb.threads/threadapply.exp @@ -63,7 +63,7 @@ gdb_test_multiple "define backthread" "defining macro" { # Cause backtraces to fail by setting a limit. This allows us to # verify that the macro can get past the backtrace error and perform # subsequent commands. -gdb_test "set backtrace limit 3" "" +gdb_test_no_output "set backtrace limit 3" gdb_test "thread apply all backthread" "Thread ..*\\\$\[0-9]+ = 0x14.*Thread ..*\\\$\[0-9]+ = 0x14.*Thread ..*\\\$\[0-9]+ = 0x14.*Thread ..*\\\$\[0-9]+ = 0x14.*Thread ..*\\\$\[0-9]+ = 0x14.*Thread ..*\\\$\[0-9]+ = 0x14" # Go into the thread_function to check that a simple "thread apply" diff --git a/gdb/testsuite/gdb.threads/watchthreads.exp b/gdb/testsuite/gdb.threads/watchthreads.exp index df27b0b5b7a..0ab78393048 100644 --- a/gdb/testsuite/gdb.threads/watchthreads.exp +++ b/gdb/testsuite/gdb.threads/watchthreads.exp @@ -128,10 +128,10 @@ for {set i 0} {$i < 30} {incr i} { # 10 is chosen so we're guaranteed to come through here. if { $hwwp_2_enabled && $hwwp_3_enabled } { if { $args_0 >= 10 && $hwwp_2_enabled } { - gdb_test "disable 2" "" "disable first watchpoint at 10" + gdb_test_no_output "disable 2" "disable first watchpoint at 10" set hwwp_2_enabled 0 } elseif { $args_1 >= 10 && $hwwp_3_enabled } { - gdb_test "disable 3" "" "disable first watchpoint at 10" + gdb_test_no_output "disable 3" "disable first watchpoint at 10" set hwwp_3_enabled 0 } } diff --git a/gdb/testsuite/gdb.threads/watchthreads2.exp b/gdb/testsuite/gdb.threads/watchthreads2.exp index 9ceba26aa0d..07b091f27e4 100644 --- a/gdb/testsuite/gdb.threads/watchthreads2.exp +++ b/gdb/testsuite/gdb.threads/watchthreads2.exp @@ -87,10 +87,10 @@ if { $nr_started == $NR_THREADS } { gdb_test "watch x" "Hardware watchpoint 3: x" # Now that the watchpoint is set, we can let the threads increment X. -gdb_test "set var test_ready = 1" "" +gdb_test_no_output "set var test_ready = 1" # While debugging. -#gdb_test "set debug infrun 1" "" +#gdb_test_no_output "set debug infrun 1" set x_inc_line [gdb_get_line_number "X increment"] set x_thread_loc "thread_function \\\(arg=.*\\\) at .*watchthreads.c:$x_inc_line" -- 2.30.2