2002-03-07 Martin M. Hunt <hunt@redhat.com>

	* srcwin.test (5.1): Adjust line numbers to
	test now runs correctly.

diff --git a/gdb/testsuite/gdb.gdbtk/ChangeLog b/gdb/testsuite/gdb.gdbtk/ChangeLog
index 92ac9dc..fbc360a 100644 (file)
--- a/gdb/testsuite/gdb.gdbtk/ChangeLog
+++ b/gdb/testsuite/gdb.gdbtk/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-07  Martin M. Hunt  <hunt@redhat.com>
+
+       * srcwin.test (5.1): Adjust line numbers to
+       test now runs correctly.
+
 2002-01-18  Keith Seitz  <keiths@redhat.com>
 
        * console.test: Don't rely on "event generate" to do

diff --git a/gdb/testsuite/gdb.gdbtk/srcwin.test b/gdb/testsuite/gdb.gdbtk/srcwin.test
index 127351d..1219f04 100644 (file)
--- a/gdb/testsuite/gdb.gdbtk/srcwin.test
+++ b/gdb/testsuite/gdb.gdbtk/srcwin.test
@@ -1078,19 +1078,19 @@ gdbtk_test srcwin-4.3 "BP Balloons" {
 gdbtk_test srcwin-4.4 "Click on line to set BP" {
   set r 0
 
-  # click mouse button 1 at index 14.1
-  if {![click $twin [$twin bbox 14.1] <Button-1>]} {
-    set r "Click failed on line 14.1"
+  # click mouse button 1 at index 20.1
+  if {![click $twin [$twin bbox 20.1] <Button-1>]} {
+    set r "Click failed on line 20.1"
   } else {
 
-    # now look for BP at line 14
+    # now look for BP at line 20
     foreach bpnum [gdb_get_breakpoint_list] {
       set bpinfo [gdb_get_breakpoint_info $bpnum]
       lassign $bpinfo file func line pc type enabled disposition \
        ignore_count commands cond thread hit_count
       set file [lindex [file split $file] end]
       if {$file == "list0.h"} {
-       if {$line == "14"} {
+       if {$line == "20"} {
          if {$enabled == "1"} {incr r}
          if {$func == "foo"} {incr r}
          if {$type == "breakpoint"} {incr r}
@@ -1108,8 +1108,8 @@ gdbtk_test srcwin-4.4 "Click on line to set BP" {
 gdbtk_test srcwin-4.5 "Continue till here popup" {
   set twin [$stw test_get twin]
 
-  # Get coordinates of line 12
-  set b [$twin bbox 12.1]
+  # Get coordinates of line 16
+  set b [$twin bbox 16.1]
   set y [expr {[lindex $b 1] + ([lindex $b 3] / 2)}]
 
   # Continue to here
@@ -1130,12 +1130,12 @@ gdbtk_test srcwin-4.5 "Continue till here popup" {
   }
 
   list $pcs $bps
-} {12 {10.0 14.0}}
+} {16 {10.0 20.0}}
 
 # 5.1 balloon variables
 # Test: srcwin-5.1
 # Desc: variable balloon test
-# continues to BP at line 14 and checks to see that value was updated
+# continues to BP at line 20 and checks to see that value was updated
 gdbtk_test srcwin-5.1 "variable balloon test" {
   # move pointer out of the way
   warp_pointer . 0 0 
@@ -1143,13 +1143,13 @@ gdbtk_test srcwin-5.1 "variable balloon test" {
   set twin [$stw test_get twin]
 
   # move pointer to variable "x" and check balloon
-  set index [string first "x++" [$twin get 10.0 10.end]]
-  move_mouse_to $twin [$twin bbox 10.$index]
+  set index [string first "x++" [$twin get 20.0 20.end]]
+  move_mouse_to $twin [$twin bbox 20.$index]
   sleep 1
   if {[winfo ismapped $balloon]} {
     if {![string compare "x=5" [$balloon.label cget -text]]} {incr r}
     gdb_immediate "continue" 1
-    if {![string compare "x=7" [$balloon.label cget -text]]} {incr r}
+    if {![string compare "x=9" [$balloon.label cget -text]]} {incr r}
   } else {
     set r -1
   }