From cc8e9b1294eb3bfd51ce6186a18495935a8af577 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 29 Jan 2007 19:09:47 +0000 Subject: [PATCH] * gdb.cp/annota3.exp ("watch triggered on a.x"): Match optional "frame-begin" annotation. --- gdb/testsuite/ChangeLog | 3 +++ gdb/testsuite/gdb.cp/annota3.exp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index df3c755..4ce2c6c 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2007-01-29 Andreas Schwab + * gdb.cp/annota3.exp ("watch triggered on a.x"): Match optional + "frame-begin" annotation. + * gdb.cp/annota2.exp ("watch triggered on a.x"): Allow arbitrary number of "frames-invalid" annotations. diff --git a/gdb/testsuite/gdb.cp/annota3.exp b/gdb/testsuite/gdb.cp/annota3.exp index 1cd99c5..31c7195 100644 --- a/gdb/testsuite/gdb.cp/annota3.exp +++ b/gdb/testsuite/gdb.cp/annota3.exp @@ -189,7 +189,7 @@ gdb_expect_list "set watch on a.x" "$gdb_prompt$" { # send_gdb "next\n" gdb_expect { - -re "\r\n\032\032post-prompt\r\n\r\n\032\032starting\r\n\r\n\032\032watchpoint 3\r\n.*atchpoint 3: a.x\r\n\r\nOld value = 0\r\nNew value = 1\r\nmain \\(\\) at .*$srcfile:$decimal\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032stopped\r\n.*$gdb_prompt$" { + -re "\r\n\032\032post-prompt\r\n\r\n\032\032starting\r\n\r\n\032\032watchpoint 3\r\n.*atchpoint 3: a.x\r\n\r\nOld value = 0\r\nNew value = 1\r\n\r\n(\032\032frame-begin 0 0x\[0-9a-z\]+\r\n|)main \\(\\) at .*$srcfile:$decimal\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032stopped\r\n.*$gdb_prompt$" { pass "watch triggered on a.x" } -re "\r\n\032\032post-prompt\r\n\r\n\032\032starting\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032stopped\r\n$gdb_prompt$" { -- 2.7.4