[commit#2,testsuite] #2 Fix PR threads/19422 regression + Guile regression [Re: [PATCH+doc] Fix PR threads/19422 - show which thread caused stop]

Message ID 20160122205123.GA14872@host1.jankratochvil.net
State New, archived
Headers

Commit Message

Jan Kratochvil Jan. 22, 2016, 8:51 p.m. UTC
  On Fri, 22 Jan 2016 21:44:46 +0100, Pedro Alves wrote:
> Looks like you forgot to amend before pushing though -- the version
> checked in still had "Thread 1".

That was a typo/thinko, sorry.


Jan
Pedro Alves:
Looks like you forgot to amend before pushing though -- the version
checked in still had "Thread 1".

gdb/testsuite/ChangeLog
2016-01-22  Jan Kratochvil  <jan.kratochvil@redhat.com>
	    Pedro Alves  <palves@redhat.com>

	Fix testsuite compatibility with Guile.
	* gdb.gdb/selftest.exp (send ^C to child process): Drop expected Thread
	number.
---
 gdb/testsuite/ChangeLog            | 7 +++++++
 gdb/testsuite/gdb.gdb/selftest.exp | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
  

Comments

Pedro Alves Jan. 22, 2016, 8:53 p.m. UTC | #1
On 01/22/2016 08:51 PM, Jan Kratochvil wrote:
> On Fri, 22 Jan 2016 21:44:46 +0100, Pedro Alves wrote:
>> Looks like you forgot to amend before pushing though -- the version
>> checked in still had "Thread 1".
> 
> That was a typo/thinko, sorry.

No worries.  Thanks for fixing this.

Thanks,
Pedro Alves
  

Patch

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 5e99adf..8f7dc6d 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,4 +1,11 @@ 
 2016-01-22  Jan Kratochvil  <jan.kratochvil@redhat.com>
+	    Pedro Alves  <palves@redhat.com>
+
+	Fix testsuite compatibility with Guile.
+	* gdb.gdb/selftest.exp (send ^C to child process): Drop expected Thread
+	number.
+
+2016-01-22  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	Fix testsuite compatibility with Guile.
 	* gdb.gdb/selftest.exp (send ^C to child process): Accept also Thread.
diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp
index 3d98a0c..969797a 100644
--- a/gdb/testsuite/gdb.gdb/selftest.exp
+++ b/gdb/testsuite/gdb.gdb/selftest.exp
@@ -438,7 +438,7 @@  proc test_with_self { executable } {
 	send_gdb "\003"
 	# "Thread 1" is displayed iff Guile support is linked in.
 	gdb_expect {
-	    -re "(Thread 1 .*|Program) received signal SIGINT.*$gdb_prompt $" {
+	    -re "(Thread .*|Program) received signal SIGINT.*$gdb_prompt $" {
 		pass "$description"
 	    }
 	    -re ".*$gdb_prompt $" {