From b9b35694e3906d1cdecc22a997715f920aece290 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Tue, 22 Feb 2011 16:39:56 +0000 Subject: [PATCH] allow py-breakpoint.exp to work with software watchpoints 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. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.python/py-breakpoint.exp | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 5d524d4c088..599a1828441 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2011-02-22 Joel Brobecker + + * 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 * gdb.python/py-breakpoint.exp: Remove unnecessary call to diff --git a/gdb/testsuite/gdb.python/py-breakpoint.exp b/gdb/testsuite/gdb.python/py-breakpoint.exp index b9f8c4ad79c..8f5818125a2 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" -- 2.30.2