Re: [patch 3/4] Fix hw watchpoints: remove dead code [update]

[Jan Kratochvil <jan dot kratochvil at redhat dot com>]

On Wed, 07 Oct 2009 20:51:10 +0200, Joel Brobecker wrote:
> > gdb/testsuite/
> > 2009-10-03  Jan Kratochvil  <jan.kratochvil@redhat.com>
> > 
> > 	* gdb.base/watchpoint-hw.exp: New variable breakline.
> > 	(hbreak, continue to break-at-exit after hbreak): New tests.
> 
> This part is approved. The issue is that the testcase is dependent
> on another patch which is still pending.  You can either merge that
> patch into the one it depends on, but I'd rather have a separate
> small testcase for hbreak.  That way, if hbreak alone breaks, we
> only have to look at that, rather than start by isolating the hbreak
> problem from the rest of the testcase.

Understood and yes, I agree.

Checked-in, I hope it is OK separate this way with no extra approval.


Thanks,
Jan


http://sourceware.org/ml/gdb-cvs/2009-10/msg00054.html

--- src/gdb/testsuite/ChangeLog	2009/10/07 18:17:32	1.1984
+++ src/gdb/testsuite/ChangeLog	2009/10/07 19:52:27	1.1985
@@ -1,3 +1,7 @@
+2009-10-07  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb.base/hbreak.exp, gdb.base/hbreak.c: New.
+
 2009-10-07  Joel Brobecker  <brobecker@adacore.com>
 
 	* gdb.base/watchpoints.c: Add copyright header.  Reformat one
--- src/gdb/testsuite/gdb.base/hbreak.c
+++ src/gdb/testsuite/gdb.base/hbreak.c	2009-10-07 19:52:48.705986000 +0000
@@ -0,0 +1,30 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2009 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/>.  */
+
+int
+main (void)
+{
+  volatile int dummy;
+
+  /* Stub lines are present as no breakpoints/watchpoints gets hit if current PC
+     already stays on the line PC while entering "step"/"continue".  */
+
+  dummy = 0;
+  dummy = 1;	/* break-at-exit */
+
+  return 0;
+}
--- src/gdb/testsuite/gdb.base/hbreak.exp
+++ src/gdb/testsuite/gdb.base/hbreak.exp	2009-10-07 19:52:49.270771000 +0000
@@ -0,0 +1,43 @@
+# Copyright 2009 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/>.
+
+# Arch not supporting hw watchpoints does not imply no_hardware_watchpoints set.
+if {(![istarget "i?86-*-*"] && ![istarget "x86_64-*-*"]
+     && ![istarget "ia64-*-*"] && ![istarget "s390*-*-*"])
+    || [target_info exists gdb,no_hardware_watchpoints]} then {
+    verbose "Skipping hbreak test."
+    return
+}
+
+set test hbreak
+set srcfile ${test}.c
+if { [prepare_for_testing ${test}.exp ${test} ${srcfile}] } {
+    return -1
+}
+
+if ![runto_main] {
+    untested ${test}.exp
+    return -1
+}
+
+set breakline [gdb_get_line_number "break-at-exit"]
+
+gdb_test "hbreak ${srcfile}:${breakline}" \
+	 "Hardware assisted breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*${srcfile}, line ${breakline}\\." \
+	 "hbreak"
+
+gdb_test "continue" \
+	 "Continuing\\.\[ \r\n\]+Breakpoint \[0-9\]+, .*break-at-exit.*" \
+	 "continue to break-at-exit after hbreak"