[commit/testsuite] allow py-breakpoint.exp to work with software watchpoints

[Joel Brobecker <brobecker at adacore dot com>]

I noticed that the last "maint info breakpoints" test expects the
output to contain:

        .*hw watchpoint.*

But some platforms do not have hw watchpoints (for instance, the
sim on erc32 doesn't).  So I changed the expected output to accept
either.

gdb/testsuite/ChangeLog:

        * gdb.python/py-breakpoint.exp: Fix the expected output of
        one of the "maint info breakpoints" tests to accept the output
        generated on platforms that do not have hardware watchpoints.

Tested on x86_64-linux. Checked in.

---
 gdb/testsuite/ChangeLog                    |    6 ++++++
 gdb/testsuite/gdb.python/py-breakpoint.exp |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 5d524d4..599a182 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,11 @@
 2011-02-22  Joel Brobecker  <brobecker@adacore.com>
 
+	* gdb.python/py-breakpoint.exp: Fix the expected output of
+	one of the "maint info breakpoints" tests to accept the output
+	generated on platforms that do not have hardware watchpoints.
+
+2011-02-22  Joel Brobecker  <brobecker@adacore.com>
+
 	* gdb.python/py-breakpoint.exp: Remove unnecessary call to
 	clean_restart.  Be a little stricter in the expected output
 	for one of the tests.  Fix a typo in one of the comments.
diff --git a/gdb/testsuite/gdb.python/py-breakpoint.exp b/gdb/testsuite/gdb.python/py-breakpoint.exp
index b9f8c4a..8f58181 100644
--- a/gdb/testsuite/gdb.python/py-breakpoint.exp
+++ b/gdb/testsuite/gdb.python/py-breakpoint.exp
@@ -193,5 +193,5 @@ if ![runto_main] then {
 delete_breakpoints
 gdb_py_test_silent_cmd  "python wp1 = gdb.Breakpoint (\"result\", type=gdb.BP_WATCHPOINT, wp_class=gdb.WP_WRITE, internal=True )" "Set watchpoint" 0
 gdb_test "info breakpoints" "No breakpoints or watchpoints.*" "Check info breakpoints does not show invisible breakpoints"
-gdb_test "maint info breakpoints" ".*hw watchpoint.*result.*" "Check maint info breakpoints shows invisible breakpoints"
+gdb_test "maint info breakpoints" ".*watchpoint.*result.*" "Check maint info breakpoints shows invisible breakpoints"
 gdb_test "continue" ".*\[Ww\]atchpoint.*result.*Old value = 0.*New value = 25.*" "Test watchpoint write"
-- 
1.7.1