aboutsummaryrefslogtreecommitdiff
path: root/gdb/testsuite
diff options
context:
space:
mode:
Diffstat (limited to 'gdb/testsuite')
-rw-r--r--gdb/testsuite/ChangeLog21
-rw-r--r--gdb/testsuite/gdb.base/async-shell.exp2
-rw-r--r--gdb/testsuite/gdb.base/dprintf-non-stop.exp2
-rw-r--r--gdb/testsuite/gdb.base/siginfo-thread.exp2
-rw-r--r--gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp2
-rw-r--r--gdb/testsuite/gdb.java/jnpe.exp2
-rw-r--r--gdb/testsuite/gdb.threads/clone-new-thread-event.exp2
-rw-r--r--gdb/testsuite/gdb.threads/continue-pending-status.exp2
-rw-r--r--gdb/testsuite/gdb.threads/leader-exit.exp2
-rw-r--r--gdb/testsuite/gdb.threads/manythreads.exp8
-rw-r--r--gdb/testsuite/gdb.threads/pthreads.exp2
-rw-r--r--gdb/testsuite/gdb.threads/schedlock.exp2
-rw-r--r--gdb/testsuite/gdb.threads/siginfo-threads.exp2
-rw-r--r--gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp4
-rw-r--r--gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp2
-rw-r--r--gdb/testsuite/gdb.threads/sigthread.exp2
-rw-r--r--gdb/testsuite/gdb.threads/watchpoint-fork.exp4
17 files changed, 42 insertions, 21 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 08a699d..627db46 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,24 @@
+2016-01-18 Pedro Alves <palves@redhat.com>
+
+ * gdb.base/async-shell.exp: Adjust expected output.
+ * gdb.base/dprintf-non-stop.exp: Adjust expected output.
+ * gdb.base/siginfo-thread.exp: Adjust expected output.
+ * gdb.base/watchpoint-hw-hit-once.exp: Adjust expected output.
+ * gdb.java/jnpe.exp: Adjust expected output.
+ * gdb.threads/clone-new-thread-event.exp: Adjust expected output.
+ * gdb.threads/continue-pending-status.exp: Adjust expected output.
+ * gdb.threads/leader-exit.exp: Adjust expected output.
+ * gdb.threads/manythreads.exp: Adjust expected output.
+ * gdb.threads/pthreads.exp: Adjust expected output.
+ * gdb.threads/schedlock.exp: Adjust expected output.
+ * gdb.threads/siginfo-threads.exp: Adjust expected output.
+ * gdb.threads/signal-command-multiple-signals-pending.exp: Adjust
+ expected output.
+ * gdb.threads/signal-delivered-right-thread.exp: Adjust expected
+ output.
+ * gdb.threads/sigthread.exp: Adjust expected output.
+ * gdb.threads/watchpoint-fork.exp: Adjust expected output.
+
2016-01-18 Yao Qi <yao.qi@linaro.org>
* gdb.guile/scm-section-script.c: Replace @progbits with
diff --git a/gdb/testsuite/gdb.base/async-shell.exp b/gdb/testsuite/gdb.base/async-shell.exp
index 5f462b2..6b887c3 100644
--- a/gdb/testsuite/gdb.base/async-shell.exp
+++ b/gdb/testsuite/gdb.base/async-shell.exp
@@ -48,7 +48,7 @@ gdb_test_multiple $test $test {
set test "process stopped"
gdb_test_multiple "" $test {
- -re "\r\n\\\[process \[0-9\]+\\\] #1 stopped\\\.\r\n" {
+ -re "Program stopped\\\.\r\n" {
pass $test
}
}
diff --git a/gdb/testsuite/gdb.base/dprintf-non-stop.exp b/gdb/testsuite/gdb.base/dprintf-non-stop.exp
index 3c1638e..1787f6f 100644
--- a/gdb/testsuite/gdb.base/dprintf-non-stop.exp
+++ b/gdb/testsuite/gdb.base/dprintf-non-stop.exp
@@ -64,7 +64,7 @@ gdb_test_multiple $test $test {
set test "inferior stopped"
gdb_test_multiple "" $test {
- -re "\r\n\\\[.*\\\] #1 stopped\\\.\r\n" {
+ -re "Program stopped\\\.\r\n" {
pass $test
}
}
diff --git a/gdb/testsuite/gdb.base/siginfo-thread.exp b/gdb/testsuite/gdb.base/siginfo-thread.exp
index 49908c4..9af99ea 100644
--- a/gdb/testsuite/gdb.base/siginfo-thread.exp
+++ b/gdb/testsuite/gdb.base/siginfo-thread.exp
@@ -41,7 +41,7 @@ if { ![runto_main] } then {
}
# Run to the signal.
-gdb_test "continue" ".*Program received signal SIGSEGV.*" "continue to signal"
+gdb_test "continue" "Thread .* received signal SIGSEGV.*" "continue to signal"
# Try to generate a core file, for a later test.
set gcorefile [standard_output_file $testfile.gcore]
diff --git a/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp b/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp
index 5c1be00..46d5c62 100644
--- a/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp
+++ b/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp
@@ -31,7 +31,7 @@ gdb_test "rwatch watchee"
gdb_breakpoint [gdb_get_line_number "dummy = 2"]
-gdb_test "continue" "Continuing.\r\nHardware read watchpoint \[0-9\]+: watchee\r\n\r\nValue = 0\r\n.*"
+gdb_test "continue" "Continuing.\r\n\r\nHardware read watchpoint \[0-9\]+: watchee\r\n\r\nValue = 0\r\n.*"
# Here should be no repeated notification of the read watchpoint.
gdb_test "continue" \
diff --git a/gdb/testsuite/gdb.java/jnpe.exp b/gdb/testsuite/gdb.java/jnpe.exp
index 092d82a..745cdf3 100644
--- a/gdb/testsuite/gdb.java/jnpe.exp
+++ b/gdb/testsuite/gdb.java/jnpe.exp
@@ -51,5 +51,5 @@ gdb_test "next" \
set line [gdb_get_line_number "stop point"]
gdb_breakpoint $line
-gdb_test "continue" "Continuing.\[\r\n\]*success\[\r\n\]*Breakpoint .*:$line\[\r\n\]*.*// stop point\[\r\n\]*" \
+gdb_test "continue" "Continuing.\[\r\n\]*success\[\r\n\]*Thread .* hit Breakpoint .*:$line\[\r\n\]*.*// stop point\[\r\n\]*" \
"continue to success for next-over-NPE"
diff --git a/gdb/testsuite/gdb.threads/clone-new-thread-event.exp b/gdb/testsuite/gdb.threads/clone-new-thread-event.exp
index 7b34adc..f7ca41e 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 4d0fce7..086407f 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 2859261..7daea8f 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 28d3550..8cc4c5c 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 473053e..1fb27cf 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 8232697..6fb6698 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 9c55b74..108d240 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 450e472..43fe779 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 d3ce821..b7ce8ef 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 bf7fa9b..71ef75a 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 a833c98..1682982 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"
}
}
}
generated by cgit v1.1 at 2024-12-16 13:08:16 +0000