OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* gdb.threads/linux-dp.exp: Adjust regexps used to scan thread 

info.  Adjust test names.
This commit is contained in:
Nathan Sidwell 2006-11-29 16:16:46 +00:00
parent 004ae5266b
commit ac6c2fba05
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gdb/testsuite/ChangeLog
View File

@ -1,5 +1,8 @@
2006-11-29 Nathan Sidwell <nathan@codesourcery.com>
* gdb.threads/linux-dp.exp: Adjust regexps used to scan thread
info. Adjust test names.
* gdb.base/break.c (main): Move position of malloc.
* gdb.base/break.exp: Revert mistaken checkin.

22
gdb/testsuite/gdb.threads/linux-dp.exp
View File

@ -73,15 +73,18 @@ for {set i 0} {$i < 5} {incr i} {
-re "info threads\r\n" {
exp_continue
}
-re "^\\*? +(\[0-9\]+ Thread \[0-9\]+) \[^\n\]*\n" {
-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"
fail "(timeout) info threads before: $i"
}
}
send_gdb "next\n"
@ -139,7 +142,7 @@ for {set i 0} {$i < 5} {incr i} {
-re "info threads\r\n" {
exp_continue
}
-re "^\\*? +(\[0-9\]+ Thread \[0-9\]+) \[^\n\]+\n" {
-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]} {
@ -153,23 +156,26 @@ for {set i 0} {$i < 5} {incr i} {
}
exp_continue
}
-re "^\[^\n\]*\n" {
verbose -log "skipping line" 2
}
-re "^$gdb_prompt $" {
if { [llength $threads_before] != 0 } {
fail "create philosopher: $i"
fail "info threads after: $i"
} elseif { !$i && [llength $threads_after] == 2 } {
set expect_manager 1
pass "create philosopher: $i"
pass "info threads after: $i"
} elseif { [llength $threads_after] == 1 } {
if { $expect_manager < 0 } {
set expect_manager 0
}
pass "create philosopher: $i"
pass "info threads after: $i"
} else {
fail "create philosopher: $i"
fail "info threads after: $i"
}
}
timeout {
fail "(timeout) info threads"
fail "(timeout) info threads after: $i"
}
}