This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[RFA] gdb.threads, use gdb_test_no_output
- From: Michael Snyder <msnyder at vmware dot com>
- To: "gdb-patches at sourceware dot org" <gdb-patches at sourceware dot org>
- Date: Wed, 02 Jun 2010 13:25:02 -0700
- Subject: [RFA] gdb.threads, use gdb_test_no_output
2010-06-02 Michael Snyder <msnyder@vmware.com>
* 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.
Index: gdb.threads/fork-thread-pending.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/fork-thread-pending.exp,v
retrieving revision 1.2
diff -u -p -r1.2 fork-thread-pending.exp
--- gdb.threads/fork-thread-pending.exp 1 Jan 2010 07:32:06 -0000 1.2
+++ gdb.threads/fork-thread-pending.exp 2 Jun 2010 20:18:25 -0000
@@ -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"
Index: gdb.threads/hand-call-in-threads.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/hand-call-in-threads.exp,v
retrieving revision 1.3
diff -u -p -r1.3 hand-call-in-threads.exp
--- gdb.threads/hand-call-in-threads.exp 2 Jun 2010 19:58:21 -0000 1.3
+++ gdb.threads/hand-call-in-threads.exp 2 Jun 2010 20:18:26 -0000
@@ -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_thread
# 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-fra
}
}
-# 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.
Index: gdb.threads/local-watch-wrong-thread.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp,v
retrieving revision 1.2
diff -u -p -r1.2 local-watch-wrong-thread.exp
--- gdb.threads/local-watch-wrong-thread.exp 1 Jan 2010 07:32:06 -0000 1.2
+++ gdb.threads/local-watch-wrong-thread.exp 2 Jun 2010 20:18:26 -0000
@@ -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 .*" \
Index: gdb.threads/manythreads.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/manythreads.exp,v
retrieving revision 1.17
diff -u -p -r1.17 manythreads.exp
--- gdb.threads/manythreads.exp 5 May 2010 18:07:03 -0000 1.17
+++ gdb.threads/manythreads.exp 2 Jun 2010 20:18:26 -0000
@@ -33,7 +33,7 @@ if {[gdb_compile_pthreads "${srcdir}/${s
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
Index: gdb.threads/print-threads.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/print-threads.exp,v
retrieving revision 1.15
diff -u -p -r1.15 print-threads.exp
--- gdb.threads/print-threads.exp 2 Jun 2010 19:58:21 -0000 1.15
+++ gdb.threads/print-threads.exp 2 Jun 2010 20:18:26 -0000
@@ -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
Index: gdb.threads/pthreads.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/pthreads.exp,v
retrieving revision 1.20
diff -u -p -r1.20 pthreads.exp
--- gdb.threads/pthreads.exp 2 Jun 2010 19:58:21 -0000 1.20
+++ gdb.threads/pthreads.exp 2 Jun 2010 20:18:26 -0000
@@ -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" {
Index: gdb.threads/schedlock.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/schedlock.exp,v
retrieving revision 1.14
diff -u -p -r1.14 schedlock.exp
--- gdb.threads/schedlock.exp 2 Jun 2010 19:58:21 -0000 1.14
+++ gdb.threads/schedlock.exp 2 Jun 2010 20:18:26 -0000
@@ -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
# 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"
Index: gdb.threads/staticthreads.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/staticthreads.exp,v
retrieving revision 1.11
diff -u -p -r1.11 staticthreads.exp
--- gdb.threads/staticthreads.exp 5 May 2010 18:07:03 -0000 1.11
+++ gdb.threads/staticthreads.exp 2 Jun 2010 20:18:26 -0000
@@ -38,7 +38,7 @@ if {[gdb_compile_pthreads "${srcdir}/${s
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.
Index: gdb.threads/thread-specific.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/thread-specific.exp,v
retrieving revision 1.11
diff -u -p -r1.11 thread-specific.exp
--- gdb.threads/thread-specific.exp 5 May 2010 18:07:03 -0000 1.11
+++ gdb.threads/thread-specific.exp 2 Jun 2010 20:18:26 -0000
@@ -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
Index: gdb.threads/thread-unwindonsignal.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp,v
retrieving revision 1.2
diff -u -p -r1.2 thread-unwindonsignal.exp
--- gdb.threads/thread-unwindonsignal.exp 1 Jan 2010 07:32:06 -0000 1.2
+++ gdb.threads/thread-unwindonsignal.exp 2 Jun 2010 20:18:26 -0000
@@ -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." \
Index: gdb.threads/threadapply.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/threadapply.exp,v
retrieving revision 1.9
diff -u -p -r1.9 threadapply.exp
--- gdb.threads/threadapply.exp 5 May 2010 18:07:03 -0000 1.9
+++ gdb.threads/threadapply.exp 2 Jun 2010 20:18:26 -0000
@@ -63,7 +63,7 @@ gdb_test_multiple "define backthread" "d
# 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"
Index: gdb.threads/watchthreads.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/watchthreads.exp,v
retrieving revision 1.11
diff -u -p -r1.11 watchthreads.exp
--- gdb.threads/watchthreads.exp 5 May 2010 18:07:03 -0000 1.11
+++ gdb.threads/watchthreads.exp 2 Jun 2010 20:18:26 -0000
@@ -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
}
}
Index: gdb.threads/watchthreads2.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/watchthreads2.exp,v
retrieving revision 1.3
diff -u -p -r1.3 watchthreads2.exp
--- gdb.threads/watchthreads2.exp 5 May 2010 18:07:03 -0000 1.3
+++ gdb.threads/watchthreads2.exp 2 Jun 2010 20:18:26 -0000
@@ -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"