diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.threads/execl.exp | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.threads/thread-specific.exp | 7 |
3 files changed, 12 insertions, 4 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 093442c..05cef8a 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-12-25 Andreas Schwab <schwab@linux-m68k.org> + + * gdb.threads/thread-specific.exp (get_thread_list): Update. + * gdb.threads/execl.exp: Update. + 2010-12-23 Yao Qi <yao@codesourcery.com> * gdb.arch/arm-disp-step.exp: New. diff --git a/gdb/testsuite/gdb.threads/execl.exp b/gdb/testsuite/gdb.threads/execl.exp index 9cafeda..99d2b5d 100644 --- a/gdb/testsuite/gdb.threads/execl.exp +++ b/gdb/testsuite/gdb.threads/execl.exp @@ -57,11 +57,11 @@ gdb_test "info threads" ".*" "info threads after exec" set test "info threads after exec" gdb_test_multiple "info threads" "$test" { - -re "2 Thread .*$gdb_prompt $" { + -re "2 *Thread .*$gdb_prompt $" { # Old threads left behind. fail "$test" } - -re "4 Thread .*$gdb_prompt $" { + -re "4 *Thread .*$gdb_prompt $" { # New threads registered. fail "$test" } diff --git a/gdb/testsuite/gdb.threads/thread-specific.exp b/gdb/testsuite/gdb.threads/thread-specific.exp index 662eec3..f228730 100644 --- a/gdb/testsuite/gdb.threads/thread-specific.exp +++ b/gdb/testsuite/gdb.threads/thread-specific.exp @@ -44,11 +44,14 @@ proc get_thread_list { } { -re "New Thread \[^\n\]*\n" { exp_continue } - -re "^\\* *(\[0-9\]*) Thread \[^\n\]*main\[^\n\]*\n" { + -re "^ *Id *Target Id\[^\n\]*\n" { + exp_continue + } + -re "^\\* *(\[0-9\]*) *Thread \[^\n\]*main\[^\n\]*\n" { set thr_list "$expect_out(1,string) $thr_list" exp_continue } - -re "^ *(\[0-9\]*) Thread \[^\n\]*\n" { + -re "^ *(\[0-9\]*) *Thread \[^\n\]*\n" { lappend thr_list $expect_out(1,string) exp_continue } |