* Re: PR13473 - step N/next N does not trigger gdb.events.stop
2012-01-04 16:17 ` Tom Tromey
@ 2012-01-05 13:13 ` Pedro Alves
0 siblings, 0 replies; 3+ messages in thread
From: Pedro Alves @ 2012-01-05 13:13 UTC (permalink / raw)
To: Tom Tromey; +Cc: GDB Patches
On 01/04/2012 04:17 PM, Tom Tromey wrote:
> FWIW, this bug also affects MI.
I've now added an MI test.
> Pedro> Comments on the test?
>
> Looks good to me.
Great, thanks. Below's what I checked in.
gdb/
2012-01-05 Khoo Yit Phang <khooyp@cs.umd.edu>
* infrun.c (normal_stop): Don't skip calling the normal_stop
observers if the thread was doing a multi-step, but stopped for
some reason other than stepping.
gdb/testsuite/
2012-01-05 Pedro Alves <alves.ped@gmail.com>
* gdb.mi/mi-stepn.c, gdb.mi/mi-stepn.exp: New files.
* gdb.python/py-events.c (first): Add bits for new "step N" test.
* gdb.python/py-events.exp: Test that "step N" tripping on a
breakpoint emits a breakpoint event.
---
gdb/infrun.c | 3 +-
gdb/testsuite/gdb.mi/mi-stepn.c | 32 ++++++++++++++++++++++
gdb/testsuite/gdb.mi/mi-stepn.exp | 46 ++++++++++++++++++++++++++++++++
gdb/testsuite/gdb.python/py-events.c | 5 +++
gdb/testsuite/gdb.python/py-events.exp | 12 ++++++++
5 files changed, 97 insertions(+), 1 deletions(-)
create mode 100644 gdb/testsuite/gdb.mi/mi-stepn.c
create mode 100644 gdb/testsuite/gdb.mi/mi-stepn.exp
diff --git a/gdb/infrun.c b/gdb/infrun.c
index a6e1af7..29db420 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -6068,7 +6068,8 @@ done:
|| last.kind == TARGET_WAITKIND_SIGNALLED
|| last.kind == TARGET_WAITKIND_EXITED
|| last.kind == TARGET_WAITKIND_NO_RESUMED
- || (!inferior_thread ()->step_multi
+ || (!(inferior_thread ()->step_multi
+ && inferior_thread ()->control.stop_step)
&& !(inferior_thread ()->control.stop_bpstat
&& inferior_thread ()->control.proceed_to_finish)
&& !inferior_thread ()->control.in_infcall))
diff --git a/gdb/testsuite/gdb.mi/mi-stepn.c b/gdb/testsuite/gdb.mi/mi-stepn.c
new file mode 100644
index 0000000..b8663d9
--- /dev/null
+++ b/gdb/testsuite/gdb.mi/mi-stepn.c
@@ -0,0 +1,32 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+ Copyright 2012 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+void
+do_nothing (void)
+{
+}
+
+int
+main ()
+{
+ int i;
+
+ for (i = 0; i < 2; i++)
+ do_nothing ();
+ return 0;
+}
diff --git a/gdb/testsuite/gdb.mi/mi-stepn.exp b/gdb/testsuite/gdb.mi/mi-stepn.exp
new file mode 100644
index 0000000..f723872
--- /dev/null
+++ b/gdb/testsuite/gdb.mi/mi-stepn.exp
@@ -0,0 +1,46 @@
+# Copyright 2011-2012 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Verify that when "-exec-step N" trips on a breakpoint, we get a
+# *stop event with reason breakpoint-hit.
+
+load_lib mi-support.exp
+set MIFLAGS "-i=mi"
+
+gdb_exit
+if [mi_gdb_start] {
+ continue
+}
+
+set testfile "mi-stepn"
+set srcfile ${testfile}.c
+set executable ${testfile}
+set binfile ${objdir}/${subdir}/${executable}
+
+set opts {debug}
+if [build_executable ${testfile}.exp ${executable} ${srcfile} $opts] {
+ return -1
+}
+
+if {[mi_run_to_main] < 0} {
+ return -1
+}
+
+mi_create_breakpoint do_nothing 2 keep do_nothing .* .* .* \
+ "breakpoint at do_nothing"
+
+mi_send_resuming_command "exec-step 3" ""
+mi_expect_stop "breakpoint-hit" "do_nothing" "\[^\n\]*" "$srcfile" \
+ "\[0-9\]*" {"" "disp=\"keep\""} "breakpoint-hit reported"
diff --git a/gdb/testsuite/gdb.python/py-events.c b/gdb/testsuite/gdb.python/py-events.c
index 00490c6..5b9a0c5 100644
--- a/gdb/testsuite/gdb.python/py-events.c
+++ b/gdb/testsuite/gdb.python/py-events.c
@@ -24,6 +24,11 @@ int second(){
}
int first(){
+ int i;
+
+ for (i = 0; i < 2; i++)
+ do_nothing ();
+
return second();
}
diff --git a/gdb/testsuite/gdb.python/py-events.exp b/gdb/testsuite/gdb.python/py-events.exp
index 0b5c1cf..0715d3c 100644
--- a/gdb/testsuite/gdb.python/py-events.exp
+++ b/gdb/testsuite/gdb.python/py-events.exp
@@ -73,6 +73,18 @@ gdb_test "continue" ".*event type: continue.*
.*breakpoint number: 3.*
all threads stopped"
+# Test that when "step N" trips on a breakpoint, we get a stop event
+# with breakpoint stop reason.
+gdb_breakpoint "do_nothing"
+gdb_test "step 3" ".*event type: continue.*
+.*event type: stop.*
+.*stop reason: breakpoint.*
+.*first breakpoint number: 4.*
+.*breakpoint number: 4.*
+all threads stopped"
+
+delete_breakpoints
+
#test exited event.
gdb_test "continue" ".*event type: continue.*
.*event type: exit.*
^ permalink raw reply [flat|nested] 3+ messages in thread