From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20636 invoked by alias); 27 Jul 2012 21:39:41 -0000 Received: (qmail 20624 invoked by uid 22791); 27 Jul 2012 21:39:39 -0000 X-SWARE-Spam-Status: No, hits=-6.3 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,SPF_HELO_PASS,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 27 Jul 2012 21:39:20 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q6RLdIjP003692 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 27 Jul 2012 17:39:19 -0400 Received: from host2.jankratochvil.net (ovpn-116-33.ams2.redhat.com [10.36.116.33]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q6RLdEJ4016154 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Fri, 27 Jul 2012 17:39:17 -0400 Date: Fri, 27 Jul 2012 21:39:00 -0000 From: Jan Kratochvil To: dje@google.com Cc: gdb-patches@sourceware.org Subject: [commit#2+7.5] [patch] testsuite: Fix gdb.mi/* regression on RHEL-6 [Re: [RFA, doc RFA] New option set use-deprecated-index-sections] Message-ID: <20120727213907.GA22390@host2.jankratochvil.net> References: <20487.14790.662664.583456@ruffy2.mtv.corp.google.com> <20120718233303.GA32519@host2.jankratochvil.net> <83liif91io.fsf@gnu.org> <83hat38ztr.fsf@gnu.org> <20488.20773.692409.554409@ruffy2.mtv.corp.google.com> <83fw8n8thj.fsf@gnu.org> <20489.40174.602435.247343@ruffy2.mtv.corp.google.com> <20120725143307.GA14336@host2.jankratochvil.net> <20120725203604.GC32664@host2.jankratochvil.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20120725203604.GC32664@host2.jankratochvil.net> User-Agent: Mutt/1.5.21 (2010-09-15) X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-07/txt/msg00711.txt.bz2 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 > > > > 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 + + 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 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"