* gdb.base/checkpoint.exp: Fix comment.

	Lengthen timeout while doing >600 checkpoints test.
	Rename duplicate "kill all one" test to keep test names unique.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e0159154fc92157fc14d0bd32dc38ece4dcd900e..c58f296ed2b12812001c13a787081718f10e62f2 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-10  Doug Evans  <dje@google.com>
+
+       * gdb.base/checkpoint.exp: Fix comment.
+       Lengthen timeout while doing >600 checkpoints test.
+       Rename duplicate "kill all one" test to keep test names unique.
+
 2010-03-10  Pedro Alves  <pedro@codesourcery.com>
 
        * gdb.base/watch-cond.c, gdb.base/watch-cond.exp: New.

diff --git a/gdb/testsuite/gdb.base/checkpoint.exp b/gdb/testsuite/gdb.base/checkpoint.exp
index dc8ce1e0df1f67b4ead45b133bf0018a8349514e..d987348f61ea9d51da07ed3df1670a8c3d469bdf 100644 (file)
--- a/gdb/testsuite/gdb.base/checkpoint.exp
+++ b/gdb/testsuite/gdb.base/checkpoint.exp
@@ -328,7 +328,7 @@ gdb_test "restart 9" "Not found.*" "no more checkpoint 9"
 gdb_test "restart 10" "Not found.*" "no more checkpoint 10"
 
 #
-# Now let's try setting a large number of checkpoints (>1000)
+# Now let's try setting a large number of checkpoints (>600)
 #
 
 gdb_exit
@@ -352,6 +352,10 @@ gdb_expect {
     timeout { fail "(timeout) set checkpoint breakpoint" }
 }
 
+set prev_timeout $timeout
+set timeout [expr $timeout + 120]
+verbose "Timeout now $timeout sec."
+
 gdb_breakpoint $break2_loc
 gdb_test "continue" "breakpoint 2.*" "break2 with many checkpoints"
 
@@ -375,9 +379,13 @@ gdb_test_multiple "info checkpoints" $msg {
 # OK, kill 'em all...
 #
 
-gdb_test "kill" "" "kill all one" \
+gdb_test "kill" "" "kill all one with many checkpoints" \
     "Kill the program being debugged.*y or n. $" "y"
 
+# Restore old timeout
+set timeout $prev_timeout
+verbose "Timeout now $timeout sec."
+
 #
 # Finished: cleanup
 #