From abc6c00fb6cbb199348ec5f0bf4d969ed48bdfad Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Tue, 13 Aug 2019 18:57:50 +0200 Subject: [PATCH] [gdb/testsuite] Fix gdb.gdb/selftest.exp regexp With gdb.gdb/selftest.exp, we get: ... (xgdb) PASS: gdb.gdb/selftest.exp: send SIGINT signal to child process ^M Thread 1 "xgdb" received signal SIGINT, Interrupt.^M 0x00007ffff5bf01db in poll () from /lib64/libc.so.6^M (gdb) FAIL: gdb.gdb/selftest.exp: send ^C to child process again ... The failure is due to gdb printing 'Thread 1 "xgdb" received signal SIGINT', but the regexp in the test-case expecting 'Program received signal SIGINT'. Fix this by updating the regexp, similar to how that is done earlier in the test-case. gdb/testsuite/ChangeLog: 2019-08-13 Tom de Vries * gdb.gdb/selftest.exp (send ^C to child process again): Accept also Thread. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.gdb/selftest.exp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 2cd9a004df0..e4b9616ddea 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-08-13 Tom de Vries + + * gdb.gdb/selftest.exp (send ^C to child process again): Accept also + Thread. + 2019-08-13 Sandra Loosemore * gdb.python/py-completion.exp: Download the .py file to the host diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp index 9651561fafe..2f481ec4044 100644 --- a/gdb/testsuite/gdb.gdb/selftest.exp +++ b/gdb/testsuite/gdb.gdb/selftest.exp @@ -119,7 +119,7 @@ proc test_with_self { } { set description "send ^C to child process again" send_gdb "\003" gdb_expect { - -re "Program received signal SIGINT.*$gdb_prompt $" { + -re "(Thread .*|Program) received signal SIGINT.*$gdb_prompt $" { pass "$description" } -re ".*$gdb_prompt $" { -- 2.30.2