From: Marcin Kościelnicki <koriakin@0x04.net>
Date: Sat, 23 Jan 2016 11:06:08 +0000 (+0100)
Subject: gdb.trace: Fix another expected message on continue.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cc5fd9abe4980e48e2cc27b0225f3c6ba7c0756b;p=binutils-gdb.git

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.
---

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
 	}
     }