summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/gdbserver/ChangeLog4
-rw-r--r--gdb/testsuite/gdb.trace/pending.exp2
2 files changed, 5 insertions, 1 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 6ddd9ce91a1..a25dc9b2cba 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-23 Marcin Koƛcielnicki <koriakin@0x04.net>
+
+ * gdb.trace/pending.exp: Fix expected message on continue.
+
2016-01-22 Marcin Koƛcielnicki <koriakin@0x04.net>
* 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 98e17f7a41f..3ef752f58e5 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
}
}