aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@ericsson.com>2015-03-04 11:37:31 -0500
committerSimon Marchi <simon.marchi@ericsson.com>2015-03-04 17:56:58 -0500
commita8d9763abd6c461d646034537633fb03f5eabfd1 (patch)
tree50eb7bcd1631b7b2ede360db5ef4be69d8285912
parent527a273ac1b6221cb37f601d211093233afc7aaf (diff)
downloadbinutils-a8d9763abd6c461d646034537633fb03f5eabfd1.zip
binutils-a8d9763abd6c461d646034537633fb03f5eabfd1.tar.gz
binutils-a8d9763abd6c461d646034537633fb03f5eabfd1.tar.bz2
Accept all-stop alternative in mi_expect_interrupt
When interrupting a thread in non-stop vs all-stop, the signal given in the MI *stopped event is not the same. Currently, mi_expect_interrupt only accepts the case for non-stop, so this adds the alternative for all-stop. gdb/testsuite/ChangeLog: * lib/mi-support.exp (mi_expect_interrupt): Accept alternative event for when in all-stop mode.
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/lib/mi-support.exp5
2 files changed, 8 insertions, 2 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 6f97eda..1a76cc8 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-04 Simon Marchi <simon.marchi@ericsson.com>
+
+ * lib/mi-support.exp (mi_expect_interrupt): Accept
+ alternative event for when in all-stop mode.
+
2015-03-04 Pedro Alves <palves@redhat.com>
* gdb.threads/thread-specific-bp.exp: Delete "info threads" test.
diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
index 20546f6..6827ef9 100644
--- a/gdb/testsuite/lib/mi-support.exp
+++ b/gdb/testsuite/lib/mi-support.exp
@@ -1195,8 +1195,9 @@ proc mi_expect_interrupt { test } {
set prompt_re "$mi_gdb_prompt$"
}
- set r "reason=\"signal-received\",signal-name=\"0\",signal-meaning=\"Signal 0\""
-
+ set r_nonstop "reason=\"signal-received\",signal-name=\"0\",signal-meaning=\"Signal 0\""
+ set r_allstop "reason=\"signal-received\",signal-name=\"SIGINT\",signal-meaning=\"Interrupt\""
+ set r "(${r_nonstop}|${r_allstop})"
set any "\[^\n\]*"
# A signal can land anywhere, just ignore the location