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.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 6f97edad8c81da465bf247f922eb7693df2e178b..1a76cc8887d0957f6fcd1c7a82e90799be73abb6 100644 (file)
--- 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 20546f64bef844804246c24b8517fb21f5480571..6827ef9cb64635fa1cdc72dc48f445cd2173655b 100644 (file)
--- 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