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

	info.  Adjust test names.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 72c6593..102c844 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -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.
 

diff --git a/gdb/testsuite/gdb.threads/linux-dp.exp b/gdb/testsuite/gdb.threads/linux-dp.exp
index c2e7c66..fe9f528 100644 (file)
--- a/gdb/testsuite/gdb.threads/linux-dp.exp
+++ b/gdb/testsuite/gdb.threads/linux-dp.exp
@@ -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"
        }
     }