From d55007b58352c0b5fd2817e003b6dcf4e3ee4c07 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 6 Aug 2015 18:22:57 +0100 Subject: [PATCH] Fix signal-while-stepping-over-bp-other-thread.exp on targets always in non-stop With "maint set target-non-stop on" we get: -PASS: gdb.threads/signal-while-stepping-over-bp-other-thread.exp: step +FAIL: gdb.threads/signal-while-stepping-over-bp-other-thread.exp: step The issue is simply that switch_back_to_stepped_thread is not used in non-stop mode, thus infrun doesn't output the expected "switching back to stepped thread" log. gdb/testsuite/ChangeLog: 2015-08-07 Pedro Alves * signal-while-stepping-over-bp-other-thread.exp: Expect "restart threads" as alternative to "switching back to stepped thread". --- gdb/ChangeLog | 5 +++++ .../signal-while-stepping-over-bp-other-thread.exp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 11a60d477e5..6bab8fad9e3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2015-08-07 Pedro Alves + + * signal-while-stepping-over-bp-other-thread.exp: Expect "restart + threads" as alternative to "switching back to stepped thread". + 2015-08-07 Pedro Alves * NEWS: Mention "maint set/show target-non-stop". diff --git a/gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-thread.exp b/gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-thread.exp index 3201b1f36e0..371395183ca 100644 --- a/gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-thread.exp +++ b/gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-thread.exp @@ -100,7 +100,7 @@ gdb_test_sequence $test $test { "need to step-over" "resume \\(step=1" "signal arrived while stepping over breakpoint" - "switching back to stepped thread" + "(restart threads|switching back to stepped thread)" "stepped to a different line" "callme" } -- 2.30.2