From cc5fd9abe4980e48e2cc27b0225f3c6ba7c0756b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marcin=20Ko=C5=9Bcielnicki?= Date: Sat, 23 Jan 2016 12:06:08 +0100 Subject: [PATCH] gdb.trace: Fix another expected message on continue. Missed one message in bd0a71fa16f668341a9361c695bc3ca44d27b322, since it didn't trigger on s390x or amd64 (fast tracepoint out of range due to shared library usage), noticed on s390. Pushed as obvious. gdb/testsuite/ChangeLog: * gdb.trace/pending.exp: Fix expected message on continue. --- gdb/gdbserver/ChangeLog | 4 ++++ gdb/testsuite/gdb.trace/pending.exp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 6ddd9ce..a25dc9b 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,7 @@ +2016-01-23 Marcin Kościelnicki + + * gdb.trace/pending.exp: Fix expected message on continue. + 2016-01-22 Marcin Kościelnicki * tracepoint.c (write_inferior_data_ptr): Cast to uintptr_t, so that diff --git a/gdb/testsuite/gdb.trace/pending.exp b/gdb/testsuite/gdb.trace/pending.exp index 98e17f7..3ef752f 100644 --- a/gdb/testsuite/gdb.trace/pending.exp +++ b/gdb/testsuite/gdb.trace/pending.exp @@ -221,7 +221,7 @@ proc pending_tracepoint_resolved_during_trace { trace_type } \ fail $test } } - -re "Continuing.\r\n(Reading .* from remote target...\r\n)?\r\nBreakpoint.*marker.*at.*$srcfile.*$gdb_prompt $" { + -re "Continuing.\r\n(Reading .* from remote target...\r\n)?\r\n(Thread .* hit )?Breakpoint.*marker.*at.*$srcfile.*$gdb_prompt $" { pass $test } } -- 2.7.4