diff options
Diffstat (limited to 'gdb/testsuite/gdb.threads')
| -rw-r--r-- | gdb/testsuite/gdb.threads/clone-new-thread-event.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.threads/continue-pending-status.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.threads/leader-exit.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.threads/manythreads.exp | 8 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.threads/pthreads.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.threads/schedlock.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.threads/siginfo-threads.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.threads/sigthread.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.threads/watchpoint-fork.exp | 4 |
11 files changed, 16 insertions, 16 deletions
diff --git a/gdb/testsuite/gdb.threads/clone-new-thread-event.exp b/gdb/testsuite/gdb.threads/clone-new-thread-event.exp index 7b34adc4d5a..f7ca41ec3fc 100644 --- a/gdb/testsuite/gdb.threads/clone-new-thread-event.exp +++ b/gdb/testsuite/gdb.threads/clone-new-thread-event.exp @@ -30,5 +30,5 @@ if { ![runto_main] } { } gdb_test "continue" \ - "Program received signal SIGUSR1, User defined signal 1.*" \ + "Thread 2 received signal SIGUSR1, User defined signal 1.*" \ "catch SIGUSR1" diff --git a/gdb/testsuite/gdb.threads/continue-pending-status.exp b/gdb/testsuite/gdb.threads/continue-pending-status.exp index 4d0fce7abc5..086407f706b 100644 --- a/gdb/testsuite/gdb.threads/continue-pending-status.exp +++ b/gdb/testsuite/gdb.threads/continue-pending-status.exp @@ -116,7 +116,7 @@ for {set i 0} {$i < $attempts} {incr i} { set msg "caught interrupt" gdb_test_multiple "" $msg { - -re "Program received signal SIGINT.*$gdb_prompt $" { + -re "Thread .* received signal SIGINT.*$gdb_prompt $" { pass $msg } } diff --git a/gdb/testsuite/gdb.threads/leader-exit.exp b/gdb/testsuite/gdb.threads/leader-exit.exp index 28592612f82..7daea8f2a2c 100644 --- a/gdb/testsuite/gdb.threads/leader-exit.exp +++ b/gdb/testsuite/gdb.threads/leader-exit.exp @@ -55,7 +55,7 @@ send_gdb "\003" set test "caught interrupt" gdb_test_multiple "" $test { - -re "Program received signal SIGINT.*$gdb_prompt $" { + -re "Thread .* received signal SIGINT.*$gdb_prompt $" { pass $test } } diff --git a/gdb/testsuite/gdb.threads/manythreads.exp b/gdb/testsuite/gdb.threads/manythreads.exp index 28d35507def..8cc4c5cc9a3 100644 --- a/gdb/testsuite/gdb.threads/manythreads.exp +++ b/gdb/testsuite/gdb.threads/manythreads.exp @@ -70,14 +70,14 @@ proc interrupt_and_wait { message } { -re "\\\[\[^\]\]* exited\\\]\r\n" { exp_continue } - -re "Program received signal SIGINT.*$gdb_prompt $" { + -re " received signal SIGINT.*$gdb_prompt $" { pass "$message" } -re "$gdb_prompt $" { # Note that with this regex order, if GDB emits [New # Thread ...] output between "Program received signal" and - # the prompt, the "Program received signal" regex won't - # match. That's good, as if we see that happening, it's a + # the prompt, the "received signal" regex won't match. + # That's good, as if we see that happening, it's a # regression. # # GDB makes sure to notify about signal stops, end of @@ -92,7 +92,7 @@ proc interrupt_and_wait { message } { # ... more new threads output ... # [New Thread NNN] # [New Thread NNN] - # Program received signal SIGINT, Interrupt. + # Thread NNN received signal SIGINT, Interrupt. # [New Thread NNN] # [New Thread NNN] # ... pages of new threads output ... diff --git a/gdb/testsuite/gdb.threads/pthreads.exp b/gdb/testsuite/gdb.threads/pthreads.exp index 473053e74cd..1fb27cfbc77 100644 --- a/gdb/testsuite/gdb.threads/pthreads.exp +++ b/gdb/testsuite/gdb.threads/pthreads.exp @@ -202,7 +202,7 @@ proc check_control_c {} { send_gdb "\003" set description "Stopped with a ^C" gdb_expect { - -re "Program received signal SIGINT.*$gdb_prompt $" { + -re "Thread .* received signal SIGINT.*$gdb_prompt $" { pass $description } -re "Quit.*$gdb_prompt $" { diff --git a/gdb/testsuite/gdb.threads/schedlock.exp b/gdb/testsuite/gdb.threads/schedlock.exp index 82326977f47..6fb669818c5 100644 --- a/gdb/testsuite/gdb.threads/schedlock.exp +++ b/gdb/testsuite/gdb.threads/schedlock.exp @@ -69,7 +69,7 @@ proc stop_process { description } { # message first, or GDB's signal handler may not be in place. after 1000 {send_gdb "\003"} gdb_expect { - -re "Program received signal SIGINT.*$gdb_prompt $" + -re "Thread .* received signal SIGINT.*$gdb_prompt $" { pass $description } diff --git a/gdb/testsuite/gdb.threads/siginfo-threads.exp b/gdb/testsuite/gdb.threads/siginfo-threads.exp index 9c55b741dac..108d240456f 100644 --- a/gdb/testsuite/gdb.threads/siginfo-threads.exp +++ b/gdb/testsuite/gdb.threads/siginfo-threads.exp @@ -51,7 +51,7 @@ for {set sigcount 0} {$sigcount < 4} {incr sigcount} { set test "catch signal $sigcount" set sigusr "" gdb_test_multiple "continue" $test { - -re "Program received signal SIGUSR(\[12\]), User defined signal \[12\]\\.\r\n.*\r\n$gdb_prompt $" { + -re "Thread .* received signal SIGUSR(\[12\]), User defined signal \[12\]\\.\r\n.*\r\n$gdb_prompt $" { set sigusr $expect_out(1,string) pass $test } diff --git a/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp b/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp index 450e47295ed..43fe779760d 100644 --- a/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp +++ b/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp @@ -68,9 +68,9 @@ proc test { schedlock } { # signal. gdb_test "thread 3" "Switching to thread 3.*" - gdb_test "continue" "Program received signal SIGUSR2.*" "stop with SIGUSR2" + gdb_test "continue" "Thread 3 .*received signal SIGUSR2.*" "stop with SIGUSR2" gdb_test "thread 2" "Switching to thread 2.*" - gdb_test "continue" "Program received signal SIGUSR1.*" "stop with SIGUSR1" + gdb_test "continue" "Thread 2 .*received signal SIGUSR1.*" "stop with SIGUSR1" gdb_test "break handler_sigusr1" "Breakpoint .* at .*$srcfile.*" gdb_test "break handler_sigusr2" "Breakpoint .* at .*$srcfile.*" diff --git a/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp b/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp index d3ce821f33a..b7ce8ef9456 100644 --- a/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp +++ b/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp @@ -41,7 +41,7 @@ proc test { command } { gdb_test "handle SIGUSR1 stop print pass" - gdb_test "continue" "Program received signal SIGUSR1.*" "stop with SIGUSR1" + gdb_test "continue" "Thread 2 .*received signal SIGUSR1.*" "stop with SIGUSR1" set pattern "\\\* 2\[ \t\]+Thread.*" diff --git a/gdb/testsuite/gdb.threads/sigthread.exp b/gdb/testsuite/gdb.threads/sigthread.exp index bf7fa9bdbaf..71ef75ac1dc 100644 --- a/gdb/testsuite/gdb.threads/sigthread.exp +++ b/gdb/testsuite/gdb.threads/sigthread.exp @@ -49,4 +49,4 @@ after 500 {send_gdb "\003"} # Make sure we do not get an internal error from hitting Control-C # while many signals are flying back and forth. -gdb_test "" "Program received signal SIGINT.*" "stop with control-c" +gdb_test "" "Thread .* received signal SIGINT.*" "stop with control-c" diff --git a/gdb/testsuite/gdb.threads/watchpoint-fork.exp b/gdb/testsuite/gdb.threads/watchpoint-fork.exp index a833c98b4bb..16829825dae 100644 --- a/gdb/testsuite/gdb.threads/watchpoint-fork.exp +++ b/gdb/testsuite/gdb.threads/watchpoint-fork.exp @@ -75,7 +75,7 @@ proc test {type symbol} { "reakpoint \[0-9\]+, marker.*" "breakpoint after the second fork" gdb_test "continue" \ "atchpoint \[0-9\]+: var.*Old value = 2.*New value = 3.*mark_exit \\(\\);" "watchpoint after the second fork" - gdb_test "continue" "Continuing\\..*\r\nBreakpoint \[0-9\]+, mark_exit .*" "finish" + gdb_test "continue" "Continuing\\..*\r\n(Thread .* hit )?Breakpoint \[0-9\]+, mark_exit .*" "finish" } # threads @@ -129,7 +129,7 @@ proc test {type symbol} { "atchpoint \[0-9\]+: var.*Old value = 5.*New value = 6.*after-fork2-A.*" "watchpoint A after the second fork" gdb_test "continue" \ "atchpoint \[0-9\]+: var.*Old value = 6.*New value = 7.*after-fork2-B.*" "watchpoint B after the second fork" - gdb_test "continue" "Continuing\\..*\r\nBreakpoint \[0-9\]+, mark_exit .*" "finish" + gdb_test "continue" "Continuing\\..*\r\nThread .* hit Breakpoint \[0-9\]+, mark_exit .*" "finish" } } } |