* mi-pthreads.exp (get_mi_thread_list): Check if expect_out

exists before using it.
        (check_mi_and_console_threads): Likewise.
        * gdb669.exp (get_mi_thread_list): Likewise.
        (check_mi_and_console_threads): Likewise.
This commit is contained in:
Keith Seitz 2002-09-25 16:08:43 +00:00
parent 512217c7cc
commit 1154261b1f
3 changed files with 35 additions and 6 deletions

View file

@ -1,3 +1,11 @@
2002-09-25 Keith Seitz <keiths@redhat.com>
* mi-pthreads.exp (get_mi_thread_list): Check if expect_out
exists before using it.
(check_mi_and_console_threads): Likewise.
* gdb669.exp (get_mi_thread_list): Likewise.
(check_mi_and_console_threads): Likewise.
2002-09-24 Keith Seitz <keiths@redhat.com> 2002-09-24 Keith Seitz <keiths@redhat.com>
* configure.in: Add config header. * configure.in: Add config header.

View file

@ -49,8 +49,12 @@ proc get_mi_thread_list {name} {
{\^done,thread-ids={(thread-id="[0-9]+"(,)?)+},number-of-threads="[0-9]+"} \ {\^done,thread-ids={(thread-id="[0-9]+"(,)?)+},number-of-threads="[0-9]+"} \
"-thread_list_ids ($name)" "-thread_list_ids ($name)"
set output {}
if {[info exists expect_out(buffer)]} {
set output $expect_out(buffer)
}
set thread_list {} set thread_list {}
if {![regexp {thread-ids=\{(thread-id="[0-9]+"(,)?)*\}} $expect_out(buffer) threads]} { if {![regexp {thread-ids=\{(thread-id="[0-9]+"(,)?)*\}} $output threads]} {
fail "finding threads in MI output ($name)" fail "finding threads in MI output ($name)"
} else { } else {
pass "finding threads in MI output ($name)" pass "finding threads in MI output ($name)"
@ -77,7 +81,10 @@ proc check_mi_and_console_threads {name} {
mi_gdb_test "-thread-list-ids" \ mi_gdb_test "-thread-list-ids" \
{\^done,thread-ids={(thread-id="[0-9]+"(,)*)+},number-of-threads="[0-9]+"} \ {\^done,thread-ids={(thread-id="[0-9]+"(,)*)+},number-of-threads="[0-9]+"} \
"-thread-list-ids ($name)" "-thread-list-ids ($name)"
set mi_output {}
if {[info exists expect_out(buffer)]} {
set mi_output $expect_out(buffer) set mi_output $expect_out(buffer)
}
# GDB will return a list of thread ids and some more info: # GDB will return a list of thread ids and some more info:
# #
@ -91,7 +98,10 @@ proc check_mi_and_console_threads {name} {
mi_gdb_test "info threads" \ mi_gdb_test "info threads" \
{.*(~".*"[\r\n]*)+.*} \ {.*(~".*"[\r\n]*)+.*} \
"info threads ($name)" "info threads ($name)"
set console_output {}
if {[info exists expect_out(buffer)]} {
set console_output $expect_out(buffer) set console_output $expect_out(buffer)
}
# Make a list of all known threads to console (gdb's thread IDs) # Make a list of all known threads to console (gdb's thread IDs)
set console_thread_list {} set console_thread_list {}

View file

@ -52,8 +52,13 @@ proc get_mi_thread_list {name} {
{\^done,thread-ids={(thread-id="[0-9]+"(,)?)+},number-of-threads="[0-9]+"} \ {\^done,thread-ids={(thread-id="[0-9]+"(,)?)+},number-of-threads="[0-9]+"} \
"-thread_list_ids ($name)" "-thread_list_ids ($name)"
set output {}
if {[info exists expect_out(buffer)]} {
set output $expect_out(buffer)
}
set thread_list {} set thread_list {}
if {![regexp {thread-ids=\{(thread-id="[0-9]+"(,)?)*\}} $expect_out(buffer) threads]} { if {![regexp {thread-ids=\{(thread-id="[0-9]+"(,)?)*\}} $output threads]} {
fail "finding threads in MI output ($name)" fail "finding threads in MI output ($name)"
} else { } else {
pass "finding threads in MI output ($name)" pass "finding threads in MI output ($name)"
@ -80,7 +85,10 @@ proc check_mi_and_console_threads {name} {
mi_gdb_test "-thread-list-ids" \ mi_gdb_test "-thread-list-ids" \
{\^done,thread-ids={(thread-id="[0-9]+"(,)*)+},number-of-threads="[0-9]+"} \ {\^done,thread-ids={(thread-id="[0-9]+"(,)*)+},number-of-threads="[0-9]+"} \
"-thread-list-ids ($name)" "-thread-list-ids ($name)"
set mi_output {}
if {[info exists expect_out(buffer)]} {
set mi_output $expect_out(buffer) set mi_output $expect_out(buffer)
}
# GDB will return a list of thread ids and some more info: # GDB will return a list of thread ids and some more info:
# #
@ -94,7 +102,10 @@ proc check_mi_and_console_threads {name} {
mi_gdb_test "info threads" \ mi_gdb_test "info threads" \
{.*(~".*"[\r\n]*)+.*} \ {.*(~".*"[\r\n]*)+.*} \
"info threads ($name)" "info threads ($name)"
set console_output {}
if {[info exists $expect_out(buffer)]} {
set console_output $expect_out(buffer) set console_output $expect_out(buffer)
}
# Make a list of all known threads to console (gdb's thread IDs) # Make a list of all known threads to console (gdb's thread IDs)
set console_thread_list {} set console_thread_list {}