diff options
author | Michael Snyder <msnyder@vmware.com> | 2010-06-10 19:48:20 +0000 |
---|---|---|
committer | Michael Snyder <msnyder@vmware.com> | 2010-06-10 19:48:20 +0000 |
commit | f6978de9f5df575df336f7044d1a7611a5f6182e (patch) | |
tree | 3b935b448fe32f3ba45a4e8042413eea01e35a37 /gdb/testsuite/gdb.threads | |
parent | 219a461e6c1b65b12a6b08ba167560c00dd2174d (diff) | |
download | gdb-f6978de9f5df575df336f7044d1a7611a5f6182e.zip gdb-f6978de9f5df575df336f7044d1a7611a5f6182e.tar.gz gdb-f6978de9f5df575df336f7044d1a7611a5f6182e.tar.bz2 |
2010-06-08 Michael Snyder <msnyder@vmware.com>
* gdb.ada/assign_1.exp: Use ".*" instead of "" as wildcard regexp.
* gdb.ada/boolean_expr.exp:
* gdb.ada/frame_args.exp: Ditto.
* gdb.ada/lang_switch.exp: Ditto.
* gdb.ada/ptype_arith_binop.exp: Ditto.
* gdb.ada/ref_param.exp: Ditto.
* gdb.ada/type_coercion.exp:Ditto.
* gdb.asm/asm-source.exp: Ditto.
* gdb.base/attach.exp: Ditto.
* gdb.base/bitfields2.exp: Ditto.
* gdb.base/call-signal-resume.exp: Ditto.
* gdb.base/callfuncs.exp: Ditto.
* gdb.base/commands.exp: Ditto.
* gdb.base/dbx.exp: Ditto.
* gdb.base/default.exp: Ditto.
* gdb.base/dump.exp: Ditto.
* gdb.base/exprs.exp: Ditto.
* gdb.base/freebpcmd.exp: Ditto.
* gdb.base/interrupt.exp: Ditto.
* gdb.base/list.exp: Ditto.
* gdb.base/long_long.exp: Ditto.
* gdb.base/maint.exp: Ditto.
* gdb.base/ptype.exp: Ditto.
* gdb.base/return.exp: Ditto.
* gdb.base/setshow.exp: Ditto.
* gdb.base/sigbpt.exp: Ditto.
* gdb.base/sigrepeat.exp: Ditto.
* gdb.cp/classes.exp: Ditto.
* gdb.dwarf2/dw2-restore.exp: Ditto.
* gdb.gdb/selftest.exp: Ditto.
* gdb.multi/base.exp: Ditto.
* gdb.multi/bkpt-multi-exec.exp: Ditto.
* gdb.python/py-block.exp: Ditto.
* gdb.python/py-prettyprint.exp: Ditto.
* gdb.python/py-template.exp: Ditto.
* gdb.server/ext-attach.exp: Ditto.
* gdb.server/ext-run.exp: Ditto.
* gdb.server/server-mon.exp: Ditto.
* gdb.threads/fork-thread-pending.exp: Ditto.
* gdb.threads/hand-call-in-threads.exp: Ditto.
* gdb.threads/interrupted-hand-call.exp: Ditto.
* gdb.threads/linux-dp.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/thread-unwindonsignal.exp: Ditto.
* gdb.threads/threadapply.exp: Ditto.
Diffstat (limited to 'gdb/testsuite/gdb.threads')
-rw-r--r-- | gdb/testsuite/gdb.threads/fork-thread-pending.exp | 2 | ||||
-rw-r--r-- | gdb/testsuite/gdb.threads/hand-call-in-threads.exp | 15 | ||||
-rw-r--r-- | gdb/testsuite/gdb.threads/interrupted-hand-call.exp | 2 | ||||
-rw-r--r-- | gdb/testsuite/gdb.threads/linux-dp.exp | 2 | ||||
-rw-r--r-- | gdb/testsuite/gdb.threads/manythreads.exp | 2 | ||||
-rw-r--r-- | gdb/testsuite/gdb.threads/print-threads.exp | 2 | ||||
-rw-r--r-- | gdb/testsuite/gdb.threads/pthreads.exp | 6 | ||||
-rw-r--r-- | gdb/testsuite/gdb.threads/schedlock.exp | 2 | ||||
-rw-r--r-- | gdb/testsuite/gdb.threads/thread-unwindonsignal.exp | 2 | ||||
-rw-r--r-- | gdb/testsuite/gdb.threads/threadapply.exp | 2 |
10 files changed, 20 insertions, 17 deletions
diff --git a/gdb/testsuite/gdb.threads/fork-thread-pending.exp b/gdb/testsuite/gdb.threads/fork-thread-pending.exp index d53ddef..382e537 100644 --- a/gdb/testsuite/gdb.threads/fork-thread-pending.exp +++ b/gdb/testsuite/gdb.threads/fork-thread-pending.exp @@ -51,7 +51,7 @@ gdb_test "continue" "Catchpoint.*" "1, get to the fork event" gdb_test "info threads" " Thread .* Thread .* Thread .* Thread .*" "1, multiple threads found" -gdb_test "thread 2" "" "1, switched away from event thread" +gdb_test "thread 2" ".*" "1, switched away from event thread" gdb_test "continue" "Not resuming.*" "1, refused to resume" diff --git a/gdb/testsuite/gdb.threads/hand-call-in-threads.exp b/gdb/testsuite/gdb.threads/hand-call-in-threads.exp index 9338330..59bf490 100644 --- a/gdb/testsuite/gdb.threads/hand-call-in-threads.exp +++ b/gdb/testsuite/gdb.threads/hand-call-in-threads.exp @@ -93,8 +93,10 @@ set total_nr_threads [expr $NR_THREADS + 1] # Thread numbering in gdb is origin-1, so begin numbering at 1. for { set i 1 } { $i <= $total_nr_threads } { incr i } { set thread_nr $i - gdb_test "thread $thread_nr" "" "prepare to make hand call, thread $thread_nr" - gdb_test "call hand_call()" "Breakpoint 3, .*" "hand call, thread $thread_nr" + gdb_test "thread $thread_nr" ".*" \ + "prepare to make hand call, thread $thread_nr" + gdb_test "call hand_call()" "Breakpoint 3, .*" \ + "hand call, thread $thread_nr" } # Now have each hand-called function return. @@ -106,7 +108,8 @@ clear_xfail "*-*-*" for { set i 1 } { $i <= $total_nr_threads } { incr i } { set thread_nr $i - gdb_test "thread $thread_nr" "" "prepare to discard hand call, thread $thread_nr" + gdb_test "thread $thread_nr" ".*" \ + "prepare to discard hand call, thread $thread_nr" set frame_number [get_dummy_frame_number] if { "$frame_number" == "" } { fail "dummy stack frame number, thread $thread_nr" @@ -116,8 +119,8 @@ for { set i 1 } { $i <= $total_nr_threads } { incr i } { pass "dummy stack frame number, thread $thread_nr" } # Pop the dummy frame. - gdb_test "frame $frame_number" "" "setting frame, thread $thread_nr" - gdb_test "return" "" "discard hand call, thread $thread_nr" + gdb_test "frame $frame_number" ".*" "setting frame, thread $thread_nr" + gdb_test "return" ".*" "discard hand call, thread $thread_nr" # In case getting the dummy frame number failed, re-enable for next iter. clear_xfail "*-*-*" } @@ -149,7 +152,7 @@ gdb_test "show scheduler-locking" ".* locking scheduler .* is \"off\"." "show sc # all_threads_running breakpoint, which wasn't the last thread to run, # and gdb doesn't know how to singlestep over reported breakpoints that # weren't in the last thread to run. -#gdb_test "thread 1" "" "set thread to 1, prepare to resume" +#gdb_test "thread 1" ".*" "set thread to 1, prepare to resume" # #gdb_continue_to_end "hand-call-in-threads" diff --git a/gdb/testsuite/gdb.threads/interrupted-hand-call.exp b/gdb/testsuite/gdb.threads/interrupted-hand-call.exp index 33b636b..d38c806 100644 --- a/gdb/testsuite/gdb.threads/interrupted-hand-call.exp +++ b/gdb/testsuite/gdb.threads/interrupted-hand-call.exp @@ -73,7 +73,7 @@ gdb_test "maint print dummy-frames" ".*stack=.*" "dummy stack frame present" # Continuing now should exit the hand-call and pop the dummy frame. -gdb_test "continue" "" "finish hand-call" +gdb_test "continue" ".*" "finish hand-call" gdb_test_multiple "maint print dummy-frames" "dummy frame popped" { -re ".*stack=.*$gdb_prompt $" { diff --git a/gdb/testsuite/gdb.threads/linux-dp.exp b/gdb/testsuite/gdb.threads/linux-dp.exp index d798a9c..fb2a2ed 100644 --- a/gdb/testsuite/gdb.threads/linux-dp.exp +++ b/gdb/testsuite/gdb.threads/linux-dp.exp @@ -58,7 +58,7 @@ gdb_test_no_output "set print sevenbit-strings" runto_main # There should be no threads initially. -gdb_test "info threads" "" "info threads 1" +gdb_test "info threads" ".*" "info threads 1" # Try stepping over the thread creation function. gdb_breakpoint [gdb_get_line_number "linuxthreads.exp: create philosopher"] diff --git a/gdb/testsuite/gdb.threads/manythreads.exp b/gdb/testsuite/gdb.threads/manythreads.exp index 385cb4b..cfdd0e7 100644 --- a/gdb/testsuite/gdb.threads/manythreads.exp +++ b/gdb/testsuite/gdb.threads/manythreads.exp @@ -41,7 +41,7 @@ runto_main # On Ultrix, we don't need it and it is really slow (because shell_escape # doesn't use vfork). if ![istarget "*-*-ultrix*"] then { - gdb_test "shell stty intr '^C'" "" + gdb_test "shell stty intr '^C'" ".*" } set message "first continue" diff --git a/gdb/testsuite/gdb.threads/print-threads.exp b/gdb/testsuite/gdb.threads/print-threads.exp index 4589d52..f12d7a5 100644 --- a/gdb/testsuite/gdb.threads/print-threads.exp +++ b/gdb/testsuite/gdb.threads/print-threads.exp @@ -55,7 +55,7 @@ gdb_test_no_output "set width 0" # On Ultrix, we don't need it and it is really slow (because shell_escape # doesn't use vfork). if ![istarget "*-*-ultrix*"] then { - gdb_test "shell stty intr '^C'" "" + gdb_test "shell stty intr '^C'" ".*" } proc test_all_threads { name kill } { diff --git a/gdb/testsuite/gdb.threads/pthreads.exp b/gdb/testsuite/gdb.threads/pthreads.exp index 44e3c4e..d2a8968 100644 --- a/gdb/testsuite/gdb.threads/pthreads.exp +++ b/gdb/testsuite/gdb.threads/pthreads.exp @@ -61,7 +61,7 @@ gdb_test_no_output "set width 0" # On Ultrix, we don't need it and it is really slow (because shell_escape # doesn't use vfork). if ![istarget "*-*-ultrix*"] then { - gdb_test "shell stty intr '^C'" "" + gdb_test "shell stty intr '^C'" ".*" } proc all_threads_running {} { @@ -82,7 +82,7 @@ proc all_threads_running {} { # been called 15 times. This should be plenty of time to allow # every thread to run at least once, since each thread sleeps for # one second between calls to common_routine. - gdb_test "tbreak common_routine if hits >= 15" "" + gdb_test "tbreak common_routine if hits >= 15" ".*" # Start all the threads running again and wait for the inferior # to stop. Since no other breakpoints are set at this time @@ -230,7 +230,7 @@ proc check_control_c {} { return 1; } } - gdb_test "bt" "" + gdb_test "bt" ".*" # Verify that all threads can be run again after a ^C stop. if [all_threads_running] then { diff --git a/gdb/testsuite/gdb.threads/schedlock.exp b/gdb/testsuite/gdb.threads/schedlock.exp index 0bdabf5..1ccc95c 100644 --- a/gdb/testsuite/gdb.threads/schedlock.exp +++ b/gdb/testsuite/gdb.threads/schedlock.exp @@ -140,7 +140,7 @@ gdb_reinitialize_dir $srcdir/$subdir # On Ultrix, we don't need it and it is really slow (because shell_escape # doesn't use vfork). if ![istarget "*-*-ultrix*"] then { - gdb_test "shell stty intr '^C'" "" + gdb_test "shell stty intr '^C'" ".*" } gdb_load ${binfile} diff --git a/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp b/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp index 45be253..a2b9545 100644 --- a/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp +++ b/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp @@ -97,7 +97,7 @@ gdb_test_multiple "thread apply all bt" "wrong thread not unwound" { # Continuing now should exit the hand-call and pop the dummy frame. -gdb_test "continue" "" "finish hand-call" +gdb_test "continue" ".*" "finish hand-call" gdb_test_multiple "maint print dummy-frames" "dummy frame popped" { -re ".*stack=.*$gdb_prompt $" { diff --git a/gdb/testsuite/gdb.threads/threadapply.exp b/gdb/testsuite/gdb.threads/threadapply.exp index 5982455..3b23902 100644 --- a/gdb/testsuite/gdb.threads/threadapply.exp +++ b/gdb/testsuite/gdb.threads/threadapply.exp @@ -46,7 +46,7 @@ if ![runto_main] then { # Break after all threads have been started. set break_line [gdb_get_line_number "Break here"] -gdb_test "b $break_line" "" +gdb_test "b $break_line" ".*" gdb_test "continue" gdb_test_multiple "define backthread" "defining macro" { |