* 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.

3 files changed, 35 insertions, 6 deletions

diff --git a/gdb/testsuite/gdb.mi/ChangeLog b/gdb/testsuite/gdb.mi/ChangeLog
index 3deddd7..eb9420b 100644
--- a/gdb/testsuite/gdb.mi/ChangeLog
+++ b/gdb/testsuite/gdb.mi/ChangeLog
@@ -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>
 
 	* configure.in: Add config header.
diff --git a/gdb/testsuite/gdb.mi/gdb669.exp b/gdb/testsuite/gdb.mi/gdb669.exp
index e8c6481..4f294b9 100644
--- a/gdb/testsuite/gdb.mi/gdb669.exp
+++ b/gdb/testsuite/gdb.mi/gdb669.exp
@@ -49,8 +49,12 @@ proc get_mi_thread_list {name} {
     {\^done,thread-ids={(thread-id="[0-9]+"(,)?)+},number-of-threads="[0-9]+"} \
     "-thread_list_ids ($name)"
 
+  set output {}
+  if {[info exists expect_out(buffer)]} {
+    set output $expect_out(buffer)
+  }
   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)"
   } else {
     pass "finding threads in MI output ($name)"
@@ -77,7 +81,10 @@ proc check_mi_and_console_threads {name} {
   mi_gdb_test "-thread-list-ids" \
     {\^done,thread-ids={(thread-id="[0-9]+"(,)*)+},number-of-threads="[0-9]+"} \
     "-thread-list-ids ($name)"
-  set mi_output $expect_out(buffer)
+  set mi_output {}
+  if {[info exists expect_out(buffer)]} {
+    set mi_output $expect_out(buffer)
+  }
 
   # 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" \
     {.*(~".*"[\r\n]*)+.*} \
     "info threads ($name)"
-  set console_output $expect_out(buffer)
+  set console_output {}
+  if {[info exists expect_out(buffer)]} {
+    set console_output $expect_out(buffer)
+  }
 
   # Make a list of all known threads to console (gdb's thread IDs)
   set console_thread_list {}
diff --git a/gdb/testsuite/gdb.mi/mi-pthreads.exp b/gdb/testsuite/gdb.mi/mi-pthreads.exp
index 900df9b..a26d434 100644
--- a/gdb/testsuite/gdb.mi/mi-pthreads.exp
+++ b/gdb/testsuite/gdb.mi/mi-pthreads.exp
@@ -52,8 +52,13 @@ proc get_mi_thread_list {name} {
     {\^done,thread-ids={(thread-id="[0-9]+"(,)?)+},number-of-threads="[0-9]+"} \
     "-thread_list_ids ($name)"
 
+  set output {}
+  if {[info exists expect_out(buffer)]} {
+    set output $expect_out(buffer)
+  }
+
   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)"
   } else {
     pass "finding threads in MI output ($name)"
@@ -80,7 +85,10 @@ proc check_mi_and_console_threads {name} {
   mi_gdb_test "-thread-list-ids" \
     {\^done,thread-ids={(thread-id="[0-9]+"(,)*)+},number-of-threads="[0-9]+"} \
     "-thread-list-ids ($name)"
-  set mi_output $expect_out(buffer)
+  set mi_output {}
+  if {[info exists expect_out(buffer)]} {
+    set mi_output $expect_out(buffer)
+  }
 
   # 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" \
     {.*(~".*"[\r\n]*)+.*} \
     "info threads ($name)"
-  set console_output $expect_out(buffer)
+  set console_output {}
+  if {[info exists $expect_out(buffer)]} {
+    set console_output $expect_out(buffer)
+  }
 
   # Make a list of all known threads to console (gdb's thread IDs)
   set console_thread_list {}