[binutils-gdb] Allow multiple occurrences of the frames-invalid annotation in gdb.cp/annota2.exp

[Yao Qi <qiyao at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=88e8ec1b3e372dc1ea1cd0be44c59ca7760e9008

commit 88e8ec1b3e372dc1ea1cd0be44c59ca7760e9008
Author: Yao Qi <yao.qi@linaro.org>
Date:   Fri Nov 27 14:21:47 2015 +0000

    Allow multiple occurrences of the frames-invalid annotation in gdb.cp/annota2.exp
    
    Hi,
    I see one fail on aarch64-linux testing,
    
      FAIL: gdb.cp/annota2.exp: watch triggered on a.x (timeout)
    
    because GDB prints two frames-invalid annotation but the test expects
    only one.
    
    next^M
    ^M
    ^Z^Zpost-prompt^M
    ^M
    ^Z^Zstarting^M
    ^M
    ^Z^Zframes-invalid^M
    ^M
    ^Z^Zframes-invalid^M
    ^M
    Note I also see the fail on Debian-s390x-m64 too.
    https://sourceware.org/ml/gdb-testers/2015-q4/msg07291.html
    
    The test shouldn't only expect one frames-invalid annotation, because
    there can be multiple times of stop/resume before the user visible
    stop.  Ulrich did something similar before
    https://www.sourceware.org/ml/gdb-patches/2009-06/msg00118.html
    
    This patch only changes ${frames_invalid} to \(${frames_invalid}\)*
    in the regexp pattern.
    
    The patch below fixes the fail on aarch64-linux.
    
    gdb/testsuite:
    
    2015-11-27  Yao Qi  <yao.qi@linaro.org>
    
    	* gdb.cp/annota2.exp: Allow multiple occurrences of the
    	frames-invalid annotation.

Diff:
---
 gdb/testsuite/ChangeLog          | 5 +++++
 gdb/testsuite/gdb.cp/annota2.exp | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f03b3c1..bff404d 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2015-11-27  Yao Qi  <yao.qi@linaro.org>
 
+	* gdb.cp/annota2.exp: Allow multiple occurrences of the
+	frames-invalid annotation.
+
+2015-11-27  Yao Qi  <yao.qi@linaro.org>
+
 	* gdb.cp/annota2.exp: Use ${frames_invalid}.
 
 2015-11-26  Simon Marchi  <simon.marchi@ericsson.com>
diff --git a/gdb/testsuite/gdb.cp/annota2.exp b/gdb/testsuite/gdb.cp/annota2.exp
index 041f65d..ed3fd1b 100644
--- a/gdb/testsuite/gdb.cp/annota2.exp
+++ b/gdb/testsuite/gdb.cp/annota2.exp
@@ -162,7 +162,7 @@ gdb_test_multiple "watch a.x" "set watch on a.x" {
 # annotate-watchpoint
 #
 gdb_test_multiple "next" "watch triggered on a.x" {
-    -re "\r\n\032\032post-prompt\r\n\r\n\032\032starting\r\n${frames_invalid}${breakpoints_invalid}\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 $hex\r\n\r\n\032\032frame-function-name\r\nmain\r\n\032\032frame-args\r\n \\(\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n.*$srcfile\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n$decimal\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n.*$gdb_prompt$" {
+    -re "\r\n\032\032post-prompt\r\n\r\n\032\032starting\r\n\(${frames_invalid}\)*${breakpoints_invalid}\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 $hex\r\n\r\n\032\032frame-function-name\r\nmain\r\n\032\032frame-args\r\n \\(\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n.*$srcfile\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n$decimal\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n.*$gdb_prompt$" {
 	pass "watch triggered on a.x"
     }
 }