From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6268 invoked by alias); 29 Nov 2006 15:59:52 -0000 Received: (qmail 6255 invoked by uid 22791); 29 Nov 2006 15:59:50 -0000 X-Spam-Check-By: sourceware.org Received: from mail.codesourcery.com (HELO mail.codesourcery.com) (65.74.133.4) by sourceware.org (qpsmtpd/0.31) with ESMTP; Wed, 29 Nov 2006 15:59:43 +0000 Received: (qmail 7299 invoked from network); 29 Nov 2006 15:59:42 -0000 Received: from unknown (HELO ?192.168.189.103?) (nathan@127.0.0.2) by mail.codesourcery.com with ESMTPA; 29 Nov 2006 15:59:42 -0000 Message-ID: <456DAE6E.4070403@codesourcery.com> Date: Wed, 29 Nov 2006 15:59:00 -0000 From: Nathan Sidwell User-Agent: Thunderbird 1.5.0.8 (X11/20061115) MIME-Version: 1.0 To: Nathan Sidwell , gdb-patches@sourceware.org Subject: Re: adjust linux-dp test References: <456DA000.6030908@codesourcery.com> <20061129150752.GW30862@caradoc.them.org> <456DA3EA.5020001@codesourcery.com> <20061129152437.GA847@nevyn.them.org> <456DA7A4.9000709@codesourcery.com> <20061129153311.GC1348@nevyn.them.org> In-Reply-To: <20061129153311.GC1348@nevyn.them.org> Content-Type: multipart/mixed; boundary="------------050407050609080701070003" 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: 2006-11/txt/msg00400.txt.bz2 This is a multi-part message in MIME format. --------------050407050609080701070003 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 376 Daniel Jacobowitz wrote: > Oh, guess so. I don't really want to add a patch that recognizes that > error message here; the error message is wrong, we really shouldn't be > printing it. this one works, ok? nathan -- Nathan Sidwell :: http://www.codesourcery.com :: CodeSourcery nathan@codesourcery.com :: http://www.planetfall.pwp.blueyonder.co.uk --------------050407050609080701070003 Content-Type: text/x-patch; name="linux.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="linux.patch" Content-length: 3258 2006-11-29 Nathan Sidwell * gdb.threads/linux-dp.exp: Adjust regexps used to scan thread info. Adjust test names. Index: testsuite/gdb.threads/linux-dp.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/linux-dp.exp,v retrieving revision 1.12 diff -c -3 -p -r1.12 linux-dp.exp *** testsuite/gdb.threads/linux-dp.exp 28 Nov 2006 15:16:48 -0000 1.12 --- testsuite/gdb.threads/linux-dp.exp 29 Nov 2006 15:58:23 -0000 *************** for {set i 0} {$i < 5} {incr i} { *** 73,87 **** -re "info threads\r\n" { exp_continue } ! -re "^\\*? +(\[0-9\]+ Thread \[0-9\]+) \[^\n\]*\n" { verbose -log "found thread $expect_out(1,string)" 2 lappend threads_before $expect_out(1,string) exp_continue } -re "^$gdb_prompt $" { } timeout { ! fail "(timeout) info threads" } } send_gdb "next\n" --- 73,90 ---- -re "info threads\r\n" { exp_continue } ! -re "^. +(\[0-9\]+ Thread \[-0-9\]+) \[^\n\]*\n" { verbose -log "found thread $expect_out(1,string)" 2 lappend threads_before $expect_out(1,string) exp_continue } + -re "^\[^\n\]*\n" { + verbose -log "skipping line" 2 + } -re "^$gdb_prompt $" { } timeout { ! fail "(timeout) info threads before: $i" } } send_gdb "next\n" *************** for {set i 0} {$i < 5} {incr i} { *** 139,145 **** -re "info threads\r\n" { exp_continue } ! -re "^\\*? +(\[0-9\]+ Thread \[0-9\]+) \[^\n\]+\n" { set name $expect_out(1,string) for {set j 0} {$j != [llength $threads_before] } {incr j} { if {$name == [lindex $threads_before $j]} { --- 142,148 ---- -re "info threads\r\n" { exp_continue } ! -re "^. +(\[0-9\]+ Thread \[-0-9\]+) \[^\n\]*\n" { set name $expect_out(1,string) for {set j 0} {$j != [llength $threads_before] } {incr j} { if {$name == [lindex $threads_before $j]} { *************** for {set i 0} {$i < 5} {incr i} { *** 153,175 **** } exp_continue } -re "^$gdb_prompt $" { if { [llength $threads_before] != 0 } { ! fail "create philosopher: $i" } elseif { !$i && [llength $threads_after] == 2 } { set expect_manager 1 ! pass "create philosopher: $i" } elseif { [llength $threads_after] == 1 } { if { $expect_manager < 0 } { set expect_manager 0 } ! pass "create philosopher: $i" } else { ! fail "create philosopher: $i" } } timeout { ! fail "(timeout) info threads" } } --- 156,181 ---- } exp_continue } + -re "^\[^\n\]*\n" { + verbose -log "skipping line" 2 + } -re "^$gdb_prompt $" { if { [llength $threads_before] != 0 } { ! fail "info threads after: $i" } elseif { !$i && [llength $threads_after] == 2 } { set expect_manager 1 ! pass "info threads after: $i" } elseif { [llength $threads_after] == 1 } { if { $expect_manager < 0 } { set expect_manager 0 } ! pass "info threads after: $i" } else { ! fail "info threads after: $i" } } timeout { ! fail "(timeout) info threads after: $i" } } --------------050407050609080701070003--