From 027c0295d85769f2bcf07218d4296644f129cfc5 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Mon, 14 May 2007 16:52:13 +0000 Subject: * linux-thread-db.c (thread_db_pid_to_str): Print thread IDs as hexadecimal. * gdb.threads/linux-dp.exp: Expect hexadecimal thread IDs. * gdb.threads/print-threads.exp (test_all_threads): Allow negative and hexadecimal thread IDs. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.threads/linux-dp.exp | 4 ++-- gdb/testsuite/gdb.threads/print-threads.exp | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'gdb/testsuite') diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index a6b1d97..f4f6305 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,11 @@ 2007-05-14 Daniel Jacobowitz + * gdb.threads/linux-dp.exp: Expect hexadecimal thread IDs. + * gdb.threads/print-threads.exp (test_all_threads): Allow + negative and hexadecimal thread IDs. + +2007-05-14 Daniel Jacobowitz + * gdb.java/jprint.java (public): Avoid invalid call to static method. diff --git a/gdb/testsuite/gdb.threads/linux-dp.exp b/gdb/testsuite/gdb.threads/linux-dp.exp index 0edb4e2..0849406 100644 --- a/gdb/testsuite/gdb.threads/linux-dp.exp +++ b/gdb/testsuite/gdb.threads/linux-dp.exp @@ -74,7 +74,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 0x\[0-9a-f\]+) \[^\n\]*\n" { verbose -log "found thread $expect_out(1,string)" 2 lappend threads_before $expect_out(1,string) exp_continue @@ -147,7 +147,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 0x\[0-9a-f\]+) \[^\n\]*\n" { set name $expect_out(1,string) for {set j 0} {$j != [llength $threads_before] } {incr j} { if {$name == [lindex $threads_before $j]} { diff --git a/gdb/testsuite/gdb.threads/print-threads.exp b/gdb/testsuite/gdb.threads/print-threads.exp index e766b5b..068029c 100644 --- a/gdb/testsuite/gdb.threads/print-threads.exp +++ b/gdb/testsuite/gdb.threads/print-threads.exp @@ -94,7 +94,7 @@ proc test_all_threads { name kill } { fail "all threads ran once ($name) (total $i threads ran)" } } - -re "Program received signal SIGTRAP.*(Thread \[0-9\]* \\(zombie\\)|0x00000000 in ).*$gdb_prompt $" { + -re "Program received signal SIGTRAP.*(Thread \[-0-9a-fx\]* \\(zombie\\)|0x00000000 in ).*$gdb_prompt $" { if { $kill == 1 } { kfail "gdb/1265" "Running threads ($name) (zombie thread)" } else { -- cgit v1.1