4 files changed, 32 insertions, 16 deletions

diff --git a/gdb/testsuite/gdb.gdbtk/ChangeLog b/gdb/testsuite/gdb.gdbtk/ChangeLog
index 53bcf354ca0..376c30b5824 100644
--- a/gdb/testsuite/gdb.gdbtk/ChangeLog
+++ b/gdb/testsuite/gdb.gdbtk/ChangeLog
@@ -1,3 +1,17 @@
+2003-02-27  Martin M. Hunt  <hunt@redhat.com>
+
+	* srcwin.test: Use "list get" instead of "listget" to
+	get contents of comboboxes. 
+	(2.1): Be less sensitive. 
+
+	* srcwin2.test: Use "list get" instead of "listget" to
+	get contents of comboboxes
+	(2-1.3): Accept assembly == mixed
+	for no source tests.
+
+	* srcwin3.test:  Use "list get" instead of "listget" to
+	get contents of comboboxes
+
 2002-09-09  Fred Fish  <fnf@intrinsity.com>
 
 	* simple.c:  Pass addresses to strncpy, not chars.
diff --git a/gdb/testsuite/gdb.gdbtk/srcwin.test b/gdb/testsuite/gdb.gdbtk/srcwin.test
index f2335872c15..eaa9ba8530e 100644
--- a/gdb/testsuite/gdb.gdbtk/srcwin.test
+++ b/gdb/testsuite/gdb.gdbtk/srcwin.test
@@ -224,20 +224,20 @@ gdbtk_test srcwin-1.13 "assembly->source mode change" {
 # Desc: check contents of filename combobox
 gdbtk_test srcwin-2.1 "check contents of filename combobox" {
   set statbar [$srcwin test_get _statbar]
-  set names [$statbar.name listget 0 end]
+  set names [$statbar.name list get 0 end]
   set r 0
-  foreach f {list0.c list1.c list0.h} {
+  foreach f {list0.c list1.c} {
     if {[lsearch $names $f] != -1} {
       incr r
     }
   }
   set r
-} {3}
+} {2}
 
 # Test: srcwin-2.2
 # Desc: check contents of function combobox
 gdbtk_test srcwin-2.2 "check contents of function combobox" {
-  set names [$statbar.func listget 0 end]
+  set names [$statbar.func list get 0 end]
   set r 0
   foreach f {main foo unused} {
     if {[lsearch $names $f] != -1} {
@@ -260,7 +260,7 @@ gdbtk_test srcwin-2.3 "goto filename" {
 # Test: srcwin-2.4
 # Desc: check contents of function combobox
 gdbtk_test srcwin-2.4 "check contents of function combobox" {
-  set names [$statbar.func listget 0 end]
+  set names [$statbar.func list get 0 end]
   set r 0
   foreach f {bar long_line oof unused} {
     if {[lsearch $names $f] != -1} {
@@ -1164,8 +1164,9 @@ gdbtk_test srcwin-5.1 "variable balloon test" {
 # 6.1 mixed mode disassembly of include file
 # Test: srcwin-6.1
 # Desc: Some versions of GDBtk can't do mixed-mode disassembly of a function
-# that is in an include file.
-gdbtk_test srcwin-6.1 "mixed mode disassembly of include file" {
+# that is in an include file. PR# mi/1101
+
+gdbtk_test srcwin-6.1 "mixed mode disassembly of include file (mi/1101)" {
   set r 0
   $srcwin mode "" MIXED
 
diff --git a/gdb/testsuite/gdb.gdbtk/srcwin2.test b/gdb/testsuite/gdb.gdbtk/srcwin2.test
index 17f838e2ec4..ee693e269cb 100644
--- a/gdb/testsuite/gdb.gdbtk/srcwin2.test
+++ b/gdb/testsuite/gdb.gdbtk/srcwin2.test
@@ -81,10 +81,11 @@ gdbtk_test srcwin2-1.3 "assembly->mixed mode change" {
   set twin [$stw test_get twin]
   set file1(mixed) [$twin get 1.0 end]
   # mixed != assembly because the lines with source should
-  # be noted, even if source in unavailable.
-  if {$file1(mixed) == $file1(assembly)} {set r -1}
+  # be noted, even if source in unavailable. This behaviour is
+  # different for different debug formats, so we accept either.
+  if {$file1(mixed) == ""} {set r -1}
   if {[$statbar.mode get] != "MIXED"} {set r -2}
-  set r
+  set r	
 } {0}
 
 # Test: srcwin2-1.4
@@ -215,20 +216,20 @@ gdbtk_test srcwin2-1.13 "assembly->source mode change" {
 # Test: srcwin2-2.1
 # Desc: check contents of filename combobox
 gdbtk_test srcwin2-2.1 "check contents of filename combobox" {
-  set names [$statbar.name listget 0 end]
+  set names [$statbar.name list get 0 end]
   set r 0
-  foreach f {list0.c list1.c list0.h} {
+  foreach f {list0.c list1.c} {
     if {[lsearch $names $f] != -1} {
       incr r
     }
   }
   set r
-} {3}
+} {2}
 
 # Test: srcwin2-2.2
 # Desc: check contents of function combobox
 gdbtk_test srcwin2-2.2 "check contents of function combobox" {
-  set names [$statbar.func listget 0 end]
+  set names [$statbar.func list get 0 end]
   set r 0
   foreach f {main foo unused} {
     if {[lsearch $names $f] != -1} {
@@ -251,7 +252,7 @@ gdbtk_test srcwin2-2.3 "goto filename" {
 # Test: srcwin2-2.4
 # Desc: check contents of function combobox
 gdbtk_test srcwin2-2.4 "check contents of function combobox" {
-  set names [$statbar.func listget 0 end]
+  set names [$statbar.func list get 0 end]
   set r 0
   foreach f {bar long_line oof unused} {
     if {[lsearch $names $f] != -1} {
diff --git a/gdb/testsuite/gdb.gdbtk/srcwin3.test b/gdb/testsuite/gdb.gdbtk/srcwin3.test
index cb888d286a1..b9a1617bb5c 100644
--- a/gdb/testsuite/gdb.gdbtk/srcwin3.test
+++ b/gdb/testsuite/gdb.gdbtk/srcwin3.test
@@ -215,7 +215,7 @@ gdbtk_test srcwin3-1.13 "assembly->source mode change" {
 # Desc: check contents of function combobox
 # There won't be any because we have no debug info
 gdbtk_test srcwin3-2.2 "check contents of function combobox" {
-  set names [$statbar.func listget 0 end]
+  set names [$statbar.func list get 0 end]
   llength $names
 } {0}