[commit#2+7.5] [patch] testsuite: Fix gdb.mi/* regression on RHEL-6 [Re: [RFA, doc RFA] New option set use-deprecated-index-sections]

[Jan Kratochvil <jan.kratochvil@redhat.com>]

On Wed, 25 Jul 2012 22:36:04 +0200, Jan Kratochvil wrote:
> On Wed, 25 Jul 2012 16:33:07 +0200, Jan Kratochvil wrote:
> > gdb/testsuite/
> > 2012-07-25  Jan Kratochvil  <jan.kratochvil@redhat.com>
> > 
> > 	Fix testsuite regression after --use-deprecated-index-sections removal.
> > 	* lib/mi-support.exp (gdbindex_warning_re): Update the expect string.
> 
> Checked in the fix part:
> 	http://sourceware.org/ml/gdb-cvs/2012-07/msg00209.html
> and for 7.5:
> 	http://sourceware.org/ml/gdb-cvs/2012-07/msg00210.html

Forgot to review the original Gary' patch

commit c55ff693014c302c8b91b99cee0484751f105e15
Date:   Fri Mar 16 16:47:29 2012 +0000
        PR breakpoints/10738

that the regex string is on two more places.  Fixed those now and checked in:
	http://sourceware.org/ml/gdb-cvs/2012-07/msg00235.html
and for 7.5:
	http://sourceware.org/ml/gdb-cvs/2012-07/msg00236.html


Jan


http://sourceware.org/ml/gdb-cvs/2012-07/msg00235.html

--- src/gdb/testsuite/ChangeLog	2012/07/27 08:09:13	1.3308
+++ src/gdb/testsuite/ChangeLog	2012/07/27 21:34:29	1.3309
@@ -1,3 +1,10 @@
+2012-07-27  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Fix testsuite regression after --use-deprecated-index-sections removal.
+	* gdb.base/annota1.exp (run until main breakpoint): Update the expect
+	string.
+	* gdb.base/async-shell.exp (gdbindex_warning_re): Likewise.
+
 2012-07-27  Yao Qi  <yao@codesourcery.com>
 
 	KFAIL for PR remote/14161.
--- src/gdb/testsuite/gdb.base/annota1.exp	2012/06/21 20:46:21	1.48
+++ src/gdb/testsuite/gdb.base/annota1.exp	2012/07/27 21:34:30	1.49
@@ -133,7 +133,7 @@
 #exp_internal 1
 set binexp [string_to_regexp $binfile]
 gdb_test_multiple "run" "run until main breakpoint" {
-    -re "\r\n\032\032post-prompt\r\nStarting program: $binexp \(\r\nwarning: Skipping \[^\r\n\]+ .gdb_index section in \[^\r\n\]+\)?\(\(\r\n\r\n\032\032frames-invalid\)|\(\r\n\r\n\032\032breakpoints-invalid\)\)+\r\n\r\n\032\032starting\(\(\r\n\r\n\032\032frames-invalid\)|\(\r\n\r\n\032\032breakpoints-invalid\)\)*\r\n\r\n\032\032breakpoint 1\r\n\r\nBreakpoint 1, \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.*annota1.c\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n$main_line\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source.*$srcfile:$main_line:.*:beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped.*$gdb_prompt$" {
+    -re "\r\n\032\032post-prompt\r\nStarting program: $binexp \(\r\nwarning: Skipping \[^\r\n\]+ .gdb_index section in \[^\r\n\]+\r\nDo \"set use-deprecated-index-sections on\" before the file is read\r\nto use the section anyway\\.\)?\(\(\r\n\r\n\032\032frames-invalid\)|\(\r\n\r\n\032\032breakpoints-invalid\)\)+\r\n\r\n\032\032starting\(\(\r\n\r\n\032\032frames-invalid\)|\(\r\n\r\n\032\032breakpoints-invalid\)\)*\r\n\r\n\032\032breakpoint 1\r\n\r\nBreakpoint 1, \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.*annota1.c\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n$main_line\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source.*$srcfile:$main_line:.*:beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped.*$gdb_prompt$" {
 	pass "run until main breakpoint" 
     }
 }
--- src/gdb/testsuite/gdb.base/async-shell.exp	2012/03/16 16:47:33	1.5
+++ src/gdb/testsuite/gdb.base/async-shell.exp	2012/07/27 21:34:30	1.6
@@ -29,7 +29,7 @@
     return -1
 }
 
-set gdbindex_warning_re "warning: Skipping \[^\r\n\]+ \\.gdb_index section \[^\r\n\]*"
+set gdbindex_warning_re "warning: Skipping \[^\r\n\]+ \\.gdb_index section \[^\r\n\]*\r\nDo \"set use-deprecated-index-sections on\" before the file is read\r\nto use the section anyway\\."
 
 gdb_test_no_output "set target-async on "
 gdb_test_no_output "set non-stop on"