Re: adjust linux-dp test

[Nathan Sidwell <nathan@codesourcery.com>]

[-- Attachment #1: Type: text/plain, Size: 376 bytes --]

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


[-- Attachment #2: linux.patch --]
[-- Type: text/x-patch, Size: 3258 bytes --]

2006-11-29  Nathan Sidwell  <nathan@codesourcery.com>

	* 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"
  	}
      }