This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH] "Program received signal" => "Thread N received signal"
- From: Pedro Alves <palves at redhat dot com>
- To: gdb-patches at sourceware dot org
- Date: Tue, 13 Nov 2012 20:10:29 +0000
- Subject: [PATCH] "Program received signal" => "Thread N received signal"
This is the patch that follows from the discussion at
<http://sourceware.org/ml/gdb/2012-11/msg00010.html>.
This changes the output GDB produces when a signal is intercepted,
from:
Program received signal SIGUSR1, User defined signal 1.
Program received signal SIGUSR1, User defined signal 1.
Program received signal SIGUSR1, User defined signal 1.
Program received signal SIGUSR1, User defined signal 1.
To:
Thread 1 received signal SIGUSR1, User defined signal 1.
Thread 2 received signal SIGUSR1, User defined signal 1.
Thread 3 received signal SIGUSR1, User defined signal 1.
Thread 4 received signal SIGUSR1, User defined signal 1.
I didn't add any knob to produce more verbose output. I think it's
best to go with simple first, and add that later if usage finds it
necessary.
No regressions on x86_64 Fedora 17.
Comments? Hmm, maybe mention it in NEWS?
gdb/
2012-11-13 Pedro Alves <palves@redhat.com>
* infrun.c (print_signal_received_reason): Tweak output to print
the thread that got the signal.
gdb/doc/
2012-11-13 Pedro Alves <palves@redhat.com>
* gdb.texinfo (Signals) <extra signal information>: Adjust example
to "Program received signal" => "Thread N received signal" output
change.
gdb/testsuite/
2012-11-13 Pedro Alves <palves@redhat.com>
Adjust to "Program received signal" => "Thread N received
signal" output change.
* gdb.arch/amd64-i386-address.exp: Adjust expected output.
* gdb.arch/i386-gnu-cfi.exp: Ditto.
* gdb.arch/i386-prologue.exp: Ditto.
* gdb.arch/i386-size-overlap.exp: Ditto.
* gdb.arch/i386-size.exp: Ditto.
* gdb.arch/i386-sse-stack-align.exp: Ditto.
* gdb.arch/i386-unwind.exp: Ditto.
* gdb.base/auxv.exp: Ditto.
* gdb.base/call-signal-resume.exp: Ditto.
* gdb.base/ending-run.exp: Ditto.
* gdb.base/interrupt.exp: Ditto.
* gdb.base/kill-after-signal.exp: Ditto.
* gdb.base/relativedebug.exp: Ditto.
* gdb.base/sigall.exp: Ditto.
* gdb.base/sigbpt.exp: Ditto.
* gdb.base/siginfo-addr.exp: Ditto.
* gdb.base/siginfo-infcall.exp: Ditto.
* gdb.base/siginfo-obj.exp: Ditto.
* gdb.base/siginfo-thread.exp: Ditto.
* gdb.base/signest.exp: Ditto.
* gdb.base/signull.exp: Ditto.
* gdb.cell/bt.exp: Ditto.
* gdb.gdb/selftest.exp: Ditto.
* gdb.hp/gdb.base-hp/hwwatchbus.exp: Ditto.
* gdb.reverse/sigall-precsave.exp: Ditto.
* gdb.reverse/sigall-reverse.exp: Ditto.
* gdb.server/solib-list.exp: Ditto.
* gdb.threads/attach-into-signal.exp: Ditto.
* gdb.threads/clone-new-thread-event.exp: Ditto.
* gdb.threads/ia64-sigill.exp: Ditto.
* gdb.threads/linux-dp.exp: Ditto.
* gdb.threads/manythreads.exp: Ditto.
* gdb.threads/pending-step.exp: Ditto.
* gdb.threads/print-threads.exp: Ditto.
* gdb.threads/pthreads.exp: Ditto.
* gdb.threads/schedlock.exp: Ditto.
* gdb.threads/siginfo-threads.exp: Ditto.
* gdb.threads/sigstep-threads.exp: Ditto.
* gdb.threads/sigthread.exp: Ditto.
* gdb.threads/staticthreads.exp: Ditto.
* gdb.threads/tls.exp: Ditto.
---
gdb/doc/gdb.texinfo | 2 -
gdb/infrun.c | 42 ++++++++++----------
gdb/testsuite/gdb.arch/amd64-i386-address.exp | 2 -
gdb/testsuite/gdb.arch/i386-gnu-cfi.exp | 2 -
gdb/testsuite/gdb.arch/i386-prologue.exp | 14 +++----
gdb/testsuite/gdb.arch/i386-size-overlap.exp | 2 -
gdb/testsuite/gdb.arch/i386-size.exp | 2 -
gdb/testsuite/gdb.arch/i386-sse-stack-align.exp | 2 -
gdb/testsuite/gdb.arch/i386-unwind.exp | 2 -
gdb/testsuite/gdb.base/auxv.exp | 2 -
gdb/testsuite/gdb.base/call-signal-resume.exp | 2 -
gdb/testsuite/gdb.base/ending-run.exp | 2 -
gdb/testsuite/gdb.base/interrupt.exp | 6 +--
gdb/testsuite/gdb.base/kill-after-signal.exp | 2 -
gdb/testsuite/gdb.base/relativedebug.exp | 2 -
gdb/testsuite/gdb.base/sigall.exp | 4 +-
gdb/testsuite/gdb.base/sigbpt.exp | 6 +--
gdb/testsuite/gdb.base/siginfo-addr.exp | 2 -
gdb/testsuite/gdb.base/siginfo-infcall.exp | 2 -
gdb/testsuite/gdb.base/siginfo-obj.exp | 4 +-
gdb/testsuite/gdb.base/siginfo-thread.exp | 2 -
gdb/testsuite/gdb.base/signest.exp | 4 +-
gdb/testsuite/gdb.base/signull.exp | 8 ++--
gdb/testsuite/gdb.cell/bt.exp | 2 -
gdb/testsuite/gdb.gdb/selftest.exp | 2 -
gdb/testsuite/gdb.hp/gdb.base-hp/hwwatchbus.exp | 2 -
gdb/testsuite/gdb.reverse/sigall-precsave.exp | 8 ++--
gdb/testsuite/gdb.reverse/sigall-reverse.exp | 8 ++--
gdb/testsuite/gdb.server/solib-list.exp | 2 -
gdb/testsuite/gdb.threads/attach-into-signal.exp | 2 -
.../gdb.threads/clone-new-thread-event.exp | 2 -
gdb/testsuite/gdb.threads/ia64-sigill.exp | 2 -
gdb/testsuite/gdb.threads/linux-dp.exp | 2 -
gdb/testsuite/gdb.threads/manythreads.exp | 6 +--
gdb/testsuite/gdb.threads/pending-step.exp | 2 -
gdb/testsuite/gdb.threads/print-threads.exp | 2 -
gdb/testsuite/gdb.threads/pthreads.exp | 2 -
gdb/testsuite/gdb.threads/schedlock.exp | 2 -
gdb/testsuite/gdb.threads/siginfo-threads.exp | 2 -
gdb/testsuite/gdb.threads/sigstep-threads.exp | 2 -
gdb/testsuite/gdb.threads/sigthread.exp | 2 -
gdb/testsuite/gdb.threads/staticthreads.exp | 2 -
gdb/testsuite/gdb.threads/tls.exp | 2 -
43 files changed, 88 insertions(+), 86 deletions(-)
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 86cfe8e..22ac79a 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -5422,7 +5422,7 @@ referenced address that raised a segmentation fault.
@smallexample
@group
(@value{GDBP}) continue
-Program received signal SIGSEGV, Segmentation fault.
+Thread 1 received signal SIGSEGV, Segmentation fault.
0x0000000000400766 in main ()
69 *(int *)p = 0;
(@value{GDBP}) ptype $_siginfo
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 4efc2af..fe7e2d6 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -5877,32 +5877,34 @@ print_signal_received_reason (enum gdb_signal siggnal)
annotate_signal ();
- if (siggnal == GDB_SIGNAL_0 && !ui_out_is_mi_like_p (uiout))
+ if (!ui_out_is_mi_like_p (uiout))
{
struct thread_info *t = inferior_thread ();
- ui_out_text (uiout, "\n[");
- ui_out_field_string (uiout, "thread-name",
- target_pid_to_str (t->ptid));
- ui_out_field_fmt (uiout, "thread-id", "] #%d", t->num);
- ui_out_text (uiout, " stopped");
+ ui_out_text (uiout, "\nThread ");
+ ui_out_field_fmt (uiout, "thread-id", "%d", t->num);
+
+ if (siggnal == GDB_SIGNAL_0)
+ {
+ ui_out_text (uiout, " stopped.\n");
+ return;
+ }
+
+ ui_out_text (uiout, " received signal ");
}
- else
- {
- ui_out_text (uiout, "\nProgram received signal ");
- annotate_signal_name ();
- if (ui_out_is_mi_like_p (uiout))
- ui_out_field_string
+
+ annotate_signal_name ();
+ if (ui_out_is_mi_like_p (uiout))
+ ui_out_field_string
(uiout, "reason", async_reason_lookup (EXEC_ASYNC_SIGNAL_RECEIVED));
- ui_out_field_string (uiout, "signal-name",
+ ui_out_field_string (uiout, "signal-name",
gdb_signal_to_name (siggnal));
- annotate_signal_name_end ();
- ui_out_text (uiout, ", ");
- annotate_signal_string ();
- ui_out_field_string (uiout, "signal-meaning",
- gdb_signal_to_string (siggnal));
- annotate_signal_string_end ();
- }
+ annotate_signal_name_end ();
+ ui_out_text (uiout, ", ");
+ annotate_signal_string ();
+ ui_out_field_string (uiout, "signal-meaning",
+ gdb_signal_to_string (siggnal));
+ annotate_signal_string_end ();
ui_out_text (uiout, ".\n");
}
diff --git a/gdb/testsuite/gdb.arch/amd64-i386-address.exp b/gdb/testsuite/gdb.arch/amd64-i386-address.exp
index dc82d7f..40dc251 100644
--- a/gdb/testsuite/gdb.arch/amd64-i386-address.exp
+++ b/gdb/testsuite/gdb.arch/amd64-i386-address.exp
@@ -32,7 +32,7 @@ gdb_run_cmd
set test "trap stop"
gdb_test_multiple "" $test {
- -re "Program received signal SIGTRAP,.*_start .*$gdb_prompt $" {
+ -re "received signal SIGTRAP,.*_start .*$gdb_prompt $" {
pass $test
}
}
diff --git a/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp b/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
index f603fc5..871cdbb 100644
--- a/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
+++ b/gdb/testsuite/gdb.arch/i386-gnu-cfi.exp
@@ -53,7 +53,7 @@ gdb_load ${binfile}
gdb_run_cmd
gdb_test_multiple {} "continue to abort()" {
- -re ".*Program received signal SIGABRT,.*$gdb_prompt $" {
+ -re ".*received signal SIGABRT,.*$gdb_prompt $" {
pass "continue to abort()"
}
}
diff --git a/gdb/testsuite/gdb.arch/i386-prologue.exp b/gdb/testsuite/gdb.arch/i386-prologue.exp
index b48952f..adaf1eb 100644
--- a/gdb/testsuite/gdb.arch/i386-prologue.exp
+++ b/gdb/testsuite/gdb.arch/i386-prologue.exp
@@ -71,7 +71,7 @@ if ![runto_main] then {
# Testcase for standard prologue.
-gdb_test "continue" "Program received signal SIGTRAP.*" "continue to standard"
+gdb_test "continue" "received signal SIGTRAP.*" "continue to standard"
skip_breakpoint standard
@@ -98,7 +98,7 @@ gdb_test "backtrace 10" \
"first backtrace in stack_align_ecx"
gdb_test "continue" \
- "Program received signal SIGTRAP.*" \
+ "received signal SIGTRAP.*" \
"continue in stack_align_ecx"
skip_breakpoint stack_align_ecx
@@ -126,7 +126,7 @@ gdb_test "backtrace 10" \
"first backtrace in stack_align_edx"
gdb_test "continue" \
- "Program received signal SIGTRAP.*" \
+ "received signal SIGTRAP.*" \
"continue in stack_align_edx"
skip_breakpoint stack_align_edx
@@ -154,7 +154,7 @@ gdb_test "backtrace 10" \
"first backtrace in stack_align_eax"
gdb_test "continue" \
- "Program received signal SIGTRAP.*" \
+ "received signal SIGTRAP.*" \
"continue in stack_align_eax"
skip_breakpoint stack_align_eax
@@ -170,7 +170,7 @@ gdb_test "info frame" \
# Testcase from symtab/1253.
-gdb_test "continue" "Program received signal SIGTRAP.*" "continue to gdb1253"
+gdb_test "continue" "received signal SIGTRAP.*" "continue to gdb1253"
skip_breakpoint gdb1253
@@ -185,7 +185,7 @@ gdb_test "info frame" \
# Testcase from backtrace/1718.
-gdb_test "continue" "Program received signal SIGTRAP.*" "continue to gdb1718"
+gdb_test "continue" "received signal SIGTRAP.*" "continue to gdb1718"
skip_breakpoint gdb1718
@@ -201,7 +201,7 @@ gdb_test "info frame" \
# Testcase from backtrace/1338.
-gdb_test "continue" "Program received signal SIGTRAP.*" "continue to gdb1338"
+gdb_test "continue" "received signal SIGTRAP.*" "continue to gdb1338"
skip_breakpoint gdb1338
diff --git a/gdb/testsuite/gdb.arch/i386-size-overlap.exp b/gdb/testsuite/gdb.arch/i386-size-overlap.exp
index 67d5db1..6c50425 100644
--- a/gdb/testsuite/gdb.arch/i386-size-overlap.exp
+++ b/gdb/testsuite/gdb.arch/i386-size-overlap.exp
@@ -45,7 +45,7 @@ gdb_load ${binfile}
gdb_run_cmd
gdb_expect {
- -re "Program received signal SIGTRAP.*$gdb_prompt $" {
+ -re "received signal SIGTRAP.*$gdb_prompt $" {
pass "run past main"
}
-re ".*$gdb_prompt $" {
diff --git a/gdb/testsuite/gdb.arch/i386-size.exp b/gdb/testsuite/gdb.arch/i386-size.exp
index 0f0b1d8..22b68cf 100644
--- a/gdb/testsuite/gdb.arch/i386-size.exp
+++ b/gdb/testsuite/gdb.arch/i386-size.exp
@@ -48,7 +48,7 @@ gdb_load ${binfile}
gdb_run_cmd
gdb_expect {
- -re "Program received signal SIGTRAP.*$gdb_prompt $" {
+ -re "received signal SIGTRAP.*$gdb_prompt $" {
pass "run past main"
}
-re ".*$gdb_prompt $" {
diff --git a/gdb/testsuite/gdb.arch/i386-sse-stack-align.exp b/gdb/testsuite/gdb.arch/i386-sse-stack-align.exp
index 5a04c74..3e12ccc 100644
--- a/gdb/testsuite/gdb.arch/i386-sse-stack-align.exp
+++ b/gdb/testsuite/gdb.arch/i386-sse-stack-align.exp
@@ -48,7 +48,7 @@ foreach i {0 1 2 3 4} {
-re " = 2\r\n$gdb_prompt $" {
pass $test
}
- -re "Program received signal SIGSEGV, Segmentation fault\\..*\r\n$gdb_prompt $" {
+ -re "received signal SIGSEGV, Segmentation fault\\..*\r\n$gdb_prompt $" {
fail $test
}
}
diff --git a/gdb/testsuite/gdb.arch/i386-unwind.exp b/gdb/testsuite/gdb.arch/i386-unwind.exp
index 89fcbc9..5adb2f4 100644
--- a/gdb/testsuite/gdb.arch/i386-unwind.exp
+++ b/gdb/testsuite/gdb.arch/i386-unwind.exp
@@ -50,7 +50,7 @@ gdb_load ${binfile}
gdb_run_cmd
gdb_expect {
- -re "Program received signal SIGTRAP.*$gdb_prompt $" {
+ -re "received signal SIGTRAP.*$gdb_prompt $" {
pass "run past gdb1435"
}
-re ".*$gdb_prompt $" {
diff --git a/gdb/testsuite/gdb.base/auxv.exp b/gdb/testsuite/gdb.base/auxv.exp
index 0c7bac4..f73cbf2 100644
--- a/gdb/testsuite/gdb.base/auxv.exp
+++ b/gdb/testsuite/gdb.base/auxv.exp
@@ -130,7 +130,7 @@ set live_data [fetch_auxv "info auxv on live process"]
set gcore_works [gdb_gcore_cmd "$gcorefile" "gcore"]
# Let the program continue and die.
-gdb_test continue ".*Program received signal.*"
+gdb_test continue ".*received signal.*"
gdb_test continue ".*Program terminated with signal.*"
# Now collect the core dump it left.
diff --git a/gdb/testsuite/gdb.base/call-signal-resume.exp b/gdb/testsuite/gdb.base/call-signal-resume.exp
index 2baa3f6..5d8f75f 100644
--- a/gdb/testsuite/gdb.base/call-signal-resume.exp
+++ b/gdb/testsuite/gdb.base/call-signal-resume.exp
@@ -121,7 +121,7 @@ gdb_test "continue" "Breakpoint \[0-9\]*, stop_two.*" \
# Continue again, we should get a signal.
-gdb_test "continue" "Program received signal .*" \
+gdb_test "continue" "received signal .*" \
"continue to receipt of signal"
# Hand call another function that prematurely stops,
diff --git a/gdb/testsuite/gdb.base/ending-run.exp b/gdb/testsuite/gdb.base/ending-run.exp
index 5699bbb..04b360a 100644
--- a/gdb/testsuite/gdb.base/ending-run.exp
+++ b/gdb/testsuite/gdb.base/ending-run.exp
@@ -191,7 +191,7 @@ gdb_test_multiple "next" "step out of main" {
-re "_*start\[0-9\]* \\(\[^)\]*\\).*$gdb_prompt $" {
pass "step out of main"
}
- -re ".*Program received signal SIGTRAP.*$gdb_prompt $" {
+ -re ".*received signal SIGTRAP.*$gdb_prompt $" {
pass "step out of main"
}
-re ".*in.*__uClibc_main.*$gdb_prompt $" {
diff --git a/gdb/testsuite/gdb.base/interrupt.exp b/gdb/testsuite/gdb.base/interrupt.exp
index 06846ec..01f966f 100644
--- a/gdb/testsuite/gdb.base/interrupt.exp
+++ b/gdb/testsuite/gdb.base/interrupt.exp
@@ -84,7 +84,7 @@ if ![file exists $binfile] then {
send_gdb "\003"
gdb_expect {
- -re "Program received signal SIGINT.*$gdb_prompt $" {
+ -re "received signal SIGINT.*$gdb_prompt $" {
pass "send_gdb control C"
}
-re ".*$gdb_prompt $" { fail "send_gdb control C" }
@@ -95,7 +95,7 @@ if ![file exists $binfile] then {
send_gdb "p func1 ()\n"
gdb_expect {
-re " = 4.*$gdb_prompt $" { pass "call function when asleep" }
- -re ".*Program received signal SIG(SEGV|ILL).*$gdb_prompt $" {
+ -re ".*received signal SIG(SEGV|ILL).*$gdb_prompt $" {
setup_xfail "i*86-pc-linux*-gnu*"
fail "child died when we called func1, skipped rest of tests"
return
@@ -173,7 +173,7 @@ if ![file exists $binfile] then {
set msg "Send Control-C, second time"
send_gdb "\003"
gdb_test_multiple "" "$msg" {
- -re "Program received signal SIGINT.*$gdb_prompt $" {
+ -re "received signal SIGINT.*$gdb_prompt $" {
pass "$msg"
}
}
diff --git a/gdb/testsuite/gdb.base/kill-after-signal.exp b/gdb/testsuite/gdb.base/kill-after-signal.exp
index 7b70510..1ee5602 100644
--- a/gdb/testsuite/gdb.base/kill-after-signal.exp
+++ b/gdb/testsuite/gdb.base/kill-after-signal.exp
@@ -30,6 +30,6 @@ if ![runto_main] {
return -1
}
-gdb_test "continue" "Program received signal SIGUSR1, .*"
+gdb_test "continue" "received signal SIGUSR1, .*"
gdb_test "stepi" "\r\nhandler .*"
gdb_test "kill" "^y" "kill" "Kill the program being debugged\\? \\(y or n\\) $" "y"
diff --git a/gdb/testsuite/gdb.base/relativedebug.exp b/gdb/testsuite/gdb.base/relativedebug.exp
index 4d570c0..ea91487 100644
--- a/gdb/testsuite/gdb.base/relativedebug.exp
+++ b/gdb/testsuite/gdb.base/relativedebug.exp
@@ -36,7 +36,7 @@ gdb_load ${binfile}
runto_main
# pause () -> SIGALRM -> handler () -> abort ()
-gdb_test "continue" "Program received signal SIGABRT.*"
+gdb_test "continue" "received signal SIGABRT.*"
# Backtracing through pause broke if glibc has been prelinked,
# because the separate debug files in /usr/lib/debug had different
diff --git a/gdb/testsuite/gdb.base/sigall.exp b/gdb/testsuite/gdb.base/sigall.exp
index 5084f22..a5cc4c8 100644
--- a/gdb/testsuite/gdb.base/sigall.exp
+++ b/gdb/testsuite/gdb.base/sigall.exp
@@ -49,7 +49,7 @@ proc test_one_sig {nextsig} {
setup_xfail "i*86-pc-linuxoldld-gnu" "i*86-pc-linuxaout-gnu"
}
gdb_test "continue" \
- "Continuing.*Program received signal SIG$thissig.*" \
+ "Continuing.*received signal SIG$thissig.*" \
"get signal $thissig"
}
if [ istarget "alpha-dec-osf3*" ] then {
@@ -192,7 +192,7 @@ gdb_test "handle SIGTERM stop print" \
"SIGTERM\[ \t\]*Yes\[ \t\]*Yes\[ \t\]*Yes.*"
gdb_test "b handle_TERM" "Breakpoint \[0-9\]+ .*"
gdb_test "continue" \
- "Continuing.*Program received signal SIGTERM.*" \
+ "Continuing.*received signal SIGTERM.*" \
"get signal TERM"
gdb_test "continue" "Breakpoint.*handle_TERM.*" "send signal TERM"
gdb_continue_to_end "continue to sigall exit"
diff --git a/gdb/testsuite/gdb.base/sigbpt.exp b/gdb/testsuite/gdb.base/sigbpt.exp
index ebe0a17..65ca6cf 100644
--- a/gdb/testsuite/gdb.base/sigbpt.exp
+++ b/gdb/testsuite/gdb.base/sigbpt.exp
@@ -86,7 +86,7 @@ gdb_test "advance *bowler" "bowler.*" "advance to the bowler"
set test "stepping to fault"
set signame "SIGSEGV"
gdb_test_multiple "stepi" "$test" {
- -re "Program received signal (SIGBUS|SIGSEGV).*pc(\r\n| *) *=> (0x\[0-9a-f\]*).*$gdb_prompt $" {
+ -re "received signal (SIGBUS|SIGSEGV).*pc(\r\n| *) *=> (0x\[0-9a-f\]*).*$gdb_prompt $" {
set signame $expect_out(1,string)
set segv_addr $expect_out(3,string)
pass "$test"
@@ -177,7 +177,7 @@ proc stepi_out { name args } {
send_gdb "stepi\n"
exp_continue
}
- -re "Program received signal SIGSEGV.*$gdb_prompt $" {
+ -re "received signal SIGSEGV.*$gdb_prompt $" {
kfail gdb/1702 "$test (executed fault insn)"
}
-re "Breakpoint.*pc(\r\n| *)[at_segv] .*bowler.*$gdb_prompt $" {
@@ -242,7 +242,7 @@ proc cont_out { name args } {
# Now single step the faulted instrction at that breakpoint.
gdb_test "stepi" \
- "Program received signal ${signame}.*pc(\r\n| *)=> [at_segv] .*" \
+ "received signal ${signame}.*pc(\r\n| *)=> [at_segv] .*" \
"${name}; stepi fault"
# Clear any breakpoints
diff --git a/gdb/testsuite/gdb.base/siginfo-addr.exp b/gdb/testsuite/gdb.base/siginfo-addr.exp
index d68d310..2b501ff 100644
--- a/gdb/testsuite/gdb.base/siginfo-addr.exp
+++ b/gdb/testsuite/gdb.base/siginfo-addr.exp
@@ -53,7 +53,7 @@ if { ![runto_main] } then {
}
# Run to the signal.
-gdb_test "continue" ".*Program received signal SIGSEGV.*" "continue to signal"
+gdb_test "continue" ".*received signal SIGSEGV.*" "continue to signal"
# Check for correct si_addr.
set test "program exit"
diff --git a/gdb/testsuite/gdb.base/siginfo-infcall.exp b/gdb/testsuite/gdb.base/siginfo-infcall.exp
index d84cd26..9a6e0cb 100644
--- a/gdb/testsuite/gdb.base/siginfo-infcall.exp
+++ b/gdb/testsuite/gdb.base/siginfo-infcall.exp
@@ -32,7 +32,7 @@ if ![runto_main] {
gdb_breakpoint "pass"
gdb_breakpoint "fail"
-gdb_test "continue" "Program received signal SIGUSR1, .*" "continue to SIGUSR1"
+gdb_test "continue" "received signal SIGUSR1, .*" "continue to SIGUSR1"
gdb_test "p callme ()" " = 42"
diff --git a/gdb/testsuite/gdb.base/siginfo-obj.exp b/gdb/testsuite/gdb.base/siginfo-obj.exp
index c6ab6ff..8eecb36 100644
--- a/gdb/testsuite/gdb.base/siginfo-obj.exp
+++ b/gdb/testsuite/gdb.base/siginfo-obj.exp
@@ -54,7 +54,7 @@ if { ![runto_main] } then {
}
# Run to the signal.
-gdb_test "continue" ".*Program received signal SIGSEGV.*" "continue to signal"
+gdb_test "continue" ".*received signal SIGSEGV.*" "continue to signal"
# Try to generate a core file, for a later test.
set gcorefile [standard_output_file $testfile.gcore]
@@ -112,7 +112,7 @@ if { ![runto_main] } then {
}
# Run to the signal.
-gdb_test "continue" ".*Program received signal SIGSEGV.*" "continue to signal"
+gdb_test "continue" ".*received signal SIGSEGV.*" "continue to signal"
set test "Set si_addr"
gdb_test "p \$_siginfo._sifields._sigfault.si_addr = 0x666" " = \\(void \\*\\) 0x666"
diff --git a/gdb/testsuite/gdb.base/siginfo-thread.exp b/gdb/testsuite/gdb.base/siginfo-thread.exp
index 315ac01..84af783 100644
--- a/gdb/testsuite/gdb.base/siginfo-thread.exp
+++ b/gdb/testsuite/gdb.base/siginfo-thread.exp
@@ -43,7 +43,7 @@ if { ![runto_main] } then {
}
# Run to the signal.
-gdb_test "continue" ".*Program received signal SIGSEGV.*" "continue to signal"
+gdb_test "continue" ".*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/signest.exp b/gdb/testsuite/gdb.base/signest.exp
index 73c3116..85b953d 100644
--- a/gdb/testsuite/gdb.base/signest.exp
+++ b/gdb/testsuite/gdb.base/signest.exp
@@ -50,7 +50,7 @@ gdb_test_multiple "x 0" "memory at address 0" {
# Run until we hit the SIGSEGV (or SIGBUS on some platforms).
gdb_test "continue" \
- ".*Program received signal (SIGBUS|SIGSEGV).*bowler.*" \
+ ".*received signal (SIGBUS|SIGSEGV).*bowler.*" \
"continue to fault"
# Insert conditional breakpoint at faulting instruction
@@ -62,6 +62,6 @@ gdb_test "handle SIGBUS nostop print pass" ".*" "pass SIGBUS"
# Step off the faulting instruction into the handler, triggering nested faults
gdb_test "continue" \
- ".*Program received signal (SIGBUS|SIGSEGV).*Program received signal (SIGBUS|SIGSEGV).*exited normally.*" \
+ ".*received signal (SIGBUS|SIGSEGV).*received signal (SIGBUS|SIGSEGV).*exited normally.*" \
"run through nested faults"
diff --git a/gdb/testsuite/gdb.base/signull.exp b/gdb/testsuite/gdb.base/signull.exp
index 9a59fb4..b7e0725 100644
--- a/gdb/testsuite/gdb.base/signull.exp
+++ b/gdb/testsuite/gdb.base/signull.exp
@@ -79,14 +79,14 @@ set test "probe function pointer"
set function_pointer code_entry_point
set signame "SIGSEGV"
gdb_test_multiple "continue" "$test" {
- -re "Program received signal SIGSEGV.*bowler .*$gdb_prompt $" {
+ -re "received signal SIGSEGV.*bowler .*$gdb_prompt $" {
set function_pointer code_descriptor
pass "$test (function descriptor)"
}
- -re "Program received signal SIGSEGV.*0.*$gdb_prompt $" {
+ -re "received signal SIGSEGV.*0.*$gdb_prompt $" {
pass "$test (function entry-point)"
}
- -re "Program received signal SIGBUS.*0.*$gdb_prompt $" {
+ -re "received signal SIGBUS.*0.*$gdb_prompt $" {
set signame SIGBUS
pass "$test (function entry-point)"
}
@@ -110,7 +110,7 @@ proc test_segv { name tag bt_from_segv bt_from_keeper } {
gdb_test continue "Breakpoint.* bowler.*" "${name}; start with the bowler"
# NB: Don't use $tag in the testname - changes across systems.
gdb_test_no_output "set test = $tag" "${name}; select the pointer type"
- gdb_test continue "Program received signal ${signame}.*" \
+ gdb_test continue "received signal ${signame}.*" \
"${name}; take the ${signame}"
gdb_test backtrace $bt_from_segv "${name}; backtrace from ${signame}"
gdb_test continue "Breakpoint.* keeper.*" "${name}; continue to the keeper"
diff --git a/gdb/testsuite/gdb.cell/bt.exp b/gdb/testsuite/gdb.cell/bt.exp
index 15a3b32..6e59205 100644
--- a/gdb/testsuite/gdb.cell/bt.exp
+++ b/gdb/testsuite/gdb.cell/bt.exp
@@ -73,7 +73,7 @@ if ![runto_main] then {
}
delete_breakpoints
-gdb_test "continue" ".*Program received signal SIGABRT, Aborted.*"
+gdb_test "continue" ".*received signal SIGABRT, Aborted.*"
gdb_test "backtrace" ".*abort.*crash_handler.*base.*offset.*<cross-architecture call>.*main.*speid.*argp.*envp.*at.*$spu2_file.c.*<cross-architecture call>.*spe_context_run.*indirect_handler.*base.*offset.*<cross-architecture call>.*main.*speid.*argp.*envp.*at.*$spu_file.c.*<cross-architecture call>.*spe_context_run.*spe_thread.*at.*$ppu_file.c.*"
diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp
index e2e327f..bc680a5 100644
--- a/gdb/testsuite/gdb.gdb/selftest.exp
+++ b/gdb/testsuite/gdb.gdb/selftest.exp
@@ -418,7 +418,7 @@ proc test_with_self { executable } {
set description "send ^C to child process"
send_gdb "\003"
gdb_expect {
- -re "Program received signal SIGINT.*$gdb_prompt $" {
+ -re "received signal SIGINT.*$gdb_prompt $" {
pass "$description"
}
-re ".*$gdb_prompt $" {
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/hwwatchbus.exp b/gdb/testsuite/gdb.hp/gdb.base-hp/hwwatchbus.exp
index af8a679..8f1dde9 100644
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/hwwatchbus.exp
+++ b/gdb/testsuite/gdb.hp/gdb.base-hp/hwwatchbus.exp
@@ -63,7 +63,7 @@ gdb_expect {
send_gdb "step\n"
gdb_expect {
- -re "Program received signal (SIGBUS|SIGSEGV), (Bus error|Segmentation fault).* in main .*${srcfile}:8.*$gdb_prompt $"\
+ -re "received signal (SIGBUS|SIGSEGV), (Bus error|Segmentation fault).* in main .*${srcfile}:8.*$gdb_prompt $"\
{pass "see real signal when h/w watchpoint set"}
-re "$gdb_prompt $"\
{fail "see real signal when h/w watchpoint set"}
diff --git a/gdb/testsuite/gdb.reverse/sigall-precsave.exp b/gdb/testsuite/gdb.reverse/sigall-precsave.exp
index d0d68a6..e633572 100644
--- a/gdb/testsuite/gdb.reverse/sigall-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/sigall-precsave.exp
@@ -53,10 +53,10 @@ proc test_one_sig {nextsig} {
}
set testmsg "get signal $thissig"
gdb_test_multiple "continue" $testmsg {
- -re "Program received signal SIG$thissig.*handle_$thissig.*$gdb_prompt $" {
+ -re "received signal SIG$thissig.*handle_$thissig.*$gdb_prompt $" {
fail "$testmsg (wrong location)"
}
- -re "Program received signal SIG$thissig.*$gdb_prompt $" {
+ -re "received signal SIG$thissig.*$gdb_prompt $" {
pass $testmsg
}
-re "Breakpoint.* handle_$thissig.*$gdb_prompt $" {
@@ -125,7 +125,7 @@ proc test_one_sig_reverse {prevsig} {
-re "Breakpoint.*handle_.*$gdb_prompt " {
pass "$testmsg (un-handled)"
}
- -re "Program received signal SIG$prevsig.*$gdb_prompt " {
+ -re "received signal SIG$prevsig.*$gdb_prompt " {
pass "reverse to signal event, $prevsig"
set nested_testmsg "reverse signal delivered"
@@ -310,7 +310,7 @@ gdb_test "handle SIGTERM stop print" \
"SIGTERM\[ \t\]*Yes\[ \t\]*Yes\[ \t\]*Yes.*"
gdb_test "b handle_TERM" "Breakpoint \[0-9\]+ .*"
gdb_test "continue" \
- "Continuing.*Program received signal SIGTERM.*" \
+ "Continuing.*received signal SIGTERM.*" \
"get signal TERM"
gdb_test "continue" "Breakpoint.*handle_TERM.*" "send signal TERM"
diff --git a/gdb/testsuite/gdb.reverse/sigall-reverse.exp b/gdb/testsuite/gdb.reverse/sigall-reverse.exp
index 3d516ac..5400b33 100644
--- a/gdb/testsuite/gdb.reverse/sigall-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/sigall-reverse.exp
@@ -52,10 +52,10 @@ proc test_one_sig {nextsig} {
}
set testmsg "get signal $thissig"
gdb_test_multiple "continue" $testmsg {
- -re "Program received signal SIG$thissig.*handle_$thissig.*$gdb_prompt $" {
+ -re "received signal SIG$thissig.*handle_$thissig.*$gdb_prompt $" {
fail "$testmsg (wrong location)"
}
- -re "Program received signal SIG$thissig.*$gdb_prompt $" {
+ -re "received signal SIG$thissig.*$gdb_prompt $" {
pass $testmsg
}
-re "Breakpoint.* handle_$thissig.*$gdb_prompt $" {
@@ -124,7 +124,7 @@ proc test_one_sig_reverse {prevsig} {
-re "Breakpoint.*handle_.*$gdb_prompt " {
pass "$testmsg (un-handled)"
}
- -re "Program received signal SIG$prevsig.*$gdb_prompt " {
+ -re "received signal SIG$prevsig.*$gdb_prompt " {
pass "reverse to signal event, $prevsig"
set nested_testmsg "reverse signal delivered"
@@ -258,7 +258,7 @@ gdb_test "handle SIGTERM stop print" \
"SIGTERM\[ \t\]*Yes\[ \t\]*Yes\[ \t\]*Yes.*"
gdb_test "b handle_TERM" "Breakpoint \[0-9\]+ .*"
gdb_test "continue" \
- "Continuing.*Program received signal SIGTERM.*" \
+ "Continuing.*received signal SIGTERM.*" \
"get signal TERM"
gdb_test "continue" "Breakpoint.*handle_TERM.*" "send signal TERM"
diff --git a/gdb/testsuite/gdb.server/solib-list.exp b/gdb/testsuite/gdb.server/solib-list.exp
index 7fbfefc..5e45d6b 100644
--- a/gdb/testsuite/gdb.server/solib-list.exp
+++ b/gdb/testsuite/gdb.server/solib-list.exp
@@ -102,7 +102,7 @@ foreach nonstop { 0 1 } { with_test_prefix "non-stop $nonstop" {
}
}
- gdb_test "continue" "Program received signal SIGUSR1, .*"
+ gdb_test "continue" "received signal SIGUSR1, .*"
gdb_test "sharedlibrary" ".*"
gdb_test "p libvar" " = 23"
}}
diff --git a/gdb/testsuite/gdb.threads/attach-into-signal.exp b/gdb/testsuite/gdb.threads/attach-into-signal.exp
index c74fafa..b2cbbf5 100644
--- a/gdb/testsuite/gdb.threads/attach-into-signal.exp
+++ b/gdb/testsuite/gdb.threads/attach-into-signal.exp
@@ -87,7 +87,7 @@ proc corefunc { threadtype executable } {
# Main test:
set test "attach (pass $passes), pending signal catch"
if {[gdb_test_multiple "attach $testpid" $test {
- -re "Attaching to program.*`?$escapedbinfile'?, process $testpid.*Program received signal SIGALRM.*$gdb_prompt $" {
+ -re "Attaching to program.*`?$escapedbinfile'?, process $testpid.*received signal SIGALRM.*$gdb_prompt $" {
# nonthreaded:
pass $test
verbose -log "$test succeeded on the attempt # $attempt of $attempts"
diff --git a/gdb/testsuite/gdb.threads/clone-new-thread-event.exp b/gdb/testsuite/gdb.threads/clone-new-thread-event.exp
index 061f2c0..9add6e0 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.*" \
+ "received signal SIGUSR1, User defined signal 1.*" \
"catch SIGUSR1"
diff --git a/gdb/testsuite/gdb.threads/ia64-sigill.exp b/gdb/testsuite/gdb.threads/ia64-sigill.exp
index a1ae60d..6ba337c 100644
--- a/gdb/testsuite/gdb.threads/ia64-sigill.exp
+++ b/gdb/testsuite/gdb.threads/ia64-sigill.exp
@@ -67,7 +67,7 @@ gdb_test_multiple "continue" $test {
# Breakpoint has been skipped in the other thread.
pass $test
}
- -re "Program received signal .*\r\n$gdb_prompt $" {
+ -re "received signal .*\r\n$gdb_prompt $" {
fail $test
}
}
diff --git a/gdb/testsuite/gdb.threads/linux-dp.exp b/gdb/testsuite/gdb.threads/linux-dp.exp
index ca65d10..a53e10b 100644
--- a/gdb/testsuite/gdb.threads/linux-dp.exp
+++ b/gdb/testsuite/gdb.threads/linux-dp.exp
@@ -94,7 +94,7 @@ for {set i 0} {$i < 5} {incr i} {
}
-re "^$gdb_prompt $" {
}
- -re "Program received signal.*(Unknown signal|SIGUSR|Real-time event).*$gdb_prompt $" {
+ -re "received signal.*(Unknown signal|SIGUSR|Real-time event).*$gdb_prompt $" {
# It would be nice if we could catch the message that GDB prints
# when it first notices that the thread library doesn't support
# debugging, or if we could explicitly ask GDB somehow.
diff --git a/gdb/testsuite/gdb.threads/manythreads.exp b/gdb/testsuite/gdb.threads/manythreads.exp
index c863ee1..8b38733 100644
--- a/gdb/testsuite/gdb.threads/manythreads.exp
+++ b/gdb/testsuite/gdb.threads/manythreads.exp
@@ -62,7 +62,7 @@ gdb_test_multiple "" "stop threads 1" {
-re "Thread \[^\n\]* executing\r\n" {
exp_continue
}
- -re "Program received signal SIGINT.*$gdb_prompt $" {
+ -re "received signal SIGINT.*$gdb_prompt $" {
pass "$message"
}
timeout {
@@ -116,7 +116,7 @@ remote_expect host 1 {
-re "Thread \[^\n\]* executing\r\n" {
exp_continue -continue_timer
}
- -re "Program received signal SIGINT.*$gdb_prompt $" {
+ -re "received signal SIGINT.*$gdb_prompt $" {
if { $failed == 0 } {
fail "check for duplicate SIGINT"
}
@@ -144,7 +144,7 @@ gdb_test_multiple "" "stop threads 2" {
-re "Thread \[^\n\]* executing\r\n" {
exp_continue
}
- -re "Program received signal SIGINT.*$gdb_prompt $" {
+ -re "received signal SIGINT.*$gdb_prompt $" {
pass "$message"
}
timeout {
diff --git a/gdb/testsuite/gdb.threads/pending-step.exp b/gdb/testsuite/gdb.threads/pending-step.exp
index b5987dd..8e72b84 100644
--- a/gdb/testsuite/gdb.threads/pending-step.exp
+++ b/gdb/testsuite/gdb.threads/pending-step.exp
@@ -70,7 +70,7 @@ set ok 0
for {set i 0} {$i < $iterations} {incr i} {
set ok 0
gdb_test_multiple "next" "$test" {
- -re "Program received signal SIGTRAP.*$gdb_prompt $" {
+ -re "received signal SIGTRAP.*$gdb_prompt $" {
fail "$test (spurious SIGTRAP)"
}
-re "$gdb_prompt $" {
diff --git a/gdb/testsuite/gdb.threads/print-threads.exp b/gdb/testsuite/gdb.threads/print-threads.exp
index 8336e29..b9bf786 100644
--- a/gdb/testsuite/gdb.threads/print-threads.exp
+++ b/gdb/testsuite/gdb.threads/print-threads.exp
@@ -77,7 +77,7 @@ proc test_all_threads { name kill } {
fail "all threads ran once ($name) (total $i threads ran)"
}
}
- -re "Program received signal SIGTRAP.*(Thread \[-0-9a-fx\]* \\(zombie\\)|0x00000000 in ).*$gdb_prompt $" {
+ -re "received signal SIGTRAP.*(Thread \[-0-9a-fx\]* \\(zombie\\)|0x00000000 in ).*$gdb_prompt $" {
if { $kill == 1 } {
kfail "gdb/1265" "Running threads ($name) (zombie thread)"
} else {
diff --git a/gdb/testsuite/gdb.threads/pthreads.exp b/gdb/testsuite/gdb.threads/pthreads.exp
index 14aa410..886a1c5 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 "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 2d0552a..631c74b 100644
--- a/gdb/testsuite/gdb.threads/schedlock.exp
+++ b/gdb/testsuite/gdb.threads/schedlock.exp
@@ -62,7 +62,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 "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 f3f9c51..966b3b4 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 "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/sigstep-threads.exp b/gdb/testsuite/gdb.threads/sigstep-threads.exp
index 484ca37..4397dc2 100644
--- a/gdb/testsuite/gdb.threads/sigstep-threads.exp
+++ b/gdb/testsuite/gdb.threads/sigstep-threads.exp
@@ -45,7 +45,7 @@ for {set i 0} {$i < 100} {incr i} {
# Presume this step failed - as in the case of a timeout.
set failed 1
gdb_test_multiple "step" $test {
- -re "\r\nProgram received signal SIGUSR1, User defined signal 1.\r\n" {
+ -re "received signal SIGUSR1, User defined signal 1.\r\n" {
exp_continue -continue_timer
}
-re "step-(\[012\]).*\r\n$gdb_prompt $" {
diff --git a/gdb/testsuite/gdb.threads/sigthread.exp b/gdb/testsuite/gdb.threads/sigthread.exp
index 7e9fb06..3584853 100644
--- a/gdb/testsuite/gdb.threads/sigthread.exp
+++ b/gdb/testsuite/gdb.threads/sigthread.exp
@@ -43,4 +43,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 "" "received signal SIGINT.*" "stop with control-c"
diff --git a/gdb/testsuite/gdb.threads/staticthreads.exp b/gdb/testsuite/gdb.threads/staticthreads.exp
index d26f3e8..e35bbf9 100644
--- a/gdb/testsuite/gdb.threads/staticthreads.exp
+++ b/gdb/testsuite/gdb.threads/staticthreads.exp
@@ -42,7 +42,7 @@ gdb_test_multiple "continue" "$test" {
-re "Breakpoint .*, .*sem_post .*$gdb_prompt " {
pass "$test"
}
- -re "Program received signal .*$gdb_prompt " {
+ -re "received signal .*$gdb_prompt " {
kfail gdb/1328 "$test"
}
}
diff --git a/gdb/testsuite/gdb.threads/tls.exp b/gdb/testsuite/gdb.threads/tls.exp
index 62ef4ef..0d5ed81 100644
--- a/gdb/testsuite/gdb.threads/tls.exp
+++ b/gdb/testsuite/gdb.threads/tls.exp
@@ -162,7 +162,7 @@ gdb_test "b [gdb_get_line_number "before exit"]" \
send_gdb "continue\n"
gdb_expect {
- -re ".*Program received signal SIGSEGV.*a_thread_local = 0;.*$gdb_prompt $" {
+ -re ".*received signal SIGSEGV.*a_thread_local = 0;.*$gdb_prompt $" {
# This is the first symptom if the gcc and binutils versions
# in use support TLS, but the system glibc does not.
unsupported "continue to first thread: system does not support TLS"