From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16418 invoked by alias); 12 Oct 2006 19:04:37 -0000 Received: (qmail 16391 invoked by uid 22791); 12 Oct 2006 19:04:35 -0000 X-Spam-Check-By: sourceware.org Received: from nevyn.them.org (HELO nevyn.them.org) (66.93.172.17) by sourceware.org (qpsmtpd/0.31.1) with ESMTP; Thu, 12 Oct 2006 19:04:31 +0000 Received: from drow by nevyn.them.org with local (Exim 4.54) id 1GY5r3-0003Ui-VE for gdb-patches@sourceware.org; Thu, 12 Oct 2006 15:04:30 -0400 Date: Thu, 12 Oct 2006 19:04:00 -0000 From: Daniel Jacobowitz To: gdb-patches@sourceware.org Subject: [commit] Fix testing for "++" in objdir Message-ID: <20061012190429.GA13316@nevyn.them.org> Mail-Followup-To: gdb-patches@sourceware.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.13 (2006-08-11) X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2006-10/txt/msg00141.txt.bz2 This fixes the remaining tests which passed an unquoted object directory as a string where a regular expression was needed. I'm going to try srcdir next, if it isn't too painful. Tested on x86_64-linux and committed. -- Daniel Jacobowitz CodeSourcery 2006-10-12 Daniel Jacobowitz * gdb.base/annota1.exp, gdb.base/maint.exp: Use string_to_regexp. Index: gdb.base/annota1.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/annota1.exp,v retrieving revision 1.19 diff -u -p -r1.19 annota1.exp --- gdb.base/annota1.exp 10 Aug 2006 05:27:20 -0000 1.19 +++ gdb.base/annota1.exp 12 Oct 2006 19:02:16 -0000 @@ -147,9 +147,10 @@ gdb_expect { # annotate-stopped # #exp_internal 1 +set binexp [string_to_regexp $binfile] send_gdb "run\n" gdb_expect { - -re "\r\n\032\032post-prompt\r\nStarting program: $binfile \(\r\n\r\n\032\032frames-invalid\)+\(\(\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\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\n\r\n\032\032frames-invalid\)+\(\(\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\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" } -re ".*$gdb_prompt$" { Index: gdb.base/maint.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/maint.exp,v retrieving revision 1.26 diff -u -p -r1.26 maint.exp --- gdb.base/maint.exp 10 Aug 2006 05:27:20 -0000 1.26 +++ gdb.base/maint.exp 12 Oct 2006 19:02:16 -0000 @@ -328,7 +328,7 @@ gdb_expect { # Check that maint print msymbols allows relative pathnames set mydir [pwd] -gdb_test "cd ${objdir}" "Working directory ${objdir}\..*" +gdb_test "cd ${objdir}" "Working directory [string_to_regexp ${objdir}]\..*" gdb_test_multiple "maint print msymbols msymbols_output2 ${subdir}/${testfile}" "maint print msymbols" { -re "^maint print msymbols msymbols_output2 \[^\n\]*\r\n$gdb_prompt $" { gdb_test_multiple "shell ls msymbols_output2" "maint print msymbols" { @@ -361,7 +361,7 @@ gdb_test_multiple "maint print msymbols fail "(timeout) maint print msymbols" } } -gdb_test "cd ${mydir}" "Working directory ${mydir}\..*" +gdb_test "cd ${mydir}" "Working directory [string_to_regexp ${mydir}]\..*" send_gdb "maint print symbols\n" gdb_expect {