From b59c075aa82883adbc791709e8950688d3e83bcd Mon Sep 17 00:00:00 2001
From: drow <drow>
Date: Fri, 9 Mar 2007 15:20:13 +0000
Subject: [PATCH] 	* gdb.base/checkpoint.exp: Rewrite 600 checkpoint test
 to 	collect output incrementally.

---
 gdb/testsuite/ChangeLog               |  5 +++++
 gdb/testsuite/gdb.base/checkpoint.exp | 17 +++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 81101fd7a2..e827efdb24 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-09  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* gdb.base/checkpoint.exp: Rewrite 600 checkpoint test to
+	collect output incrementally.
+
 2007-03-08  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
 
 	* gdb.mi/mi-var-cmd.exp: Allow value without "..." string
diff --git a/gdb/testsuite/gdb.base/checkpoint.exp b/gdb/testsuite/gdb.base/checkpoint.exp
index 1ca497a6ee..297e254e9f 100644
--- a/gdb/testsuite/gdb.base/checkpoint.exp
+++ b/gdb/testsuite/gdb.base/checkpoint.exp
@@ -359,8 +359,21 @@ gdb_expect {
 gdb_breakpoint $break2_loc
 gdb_test "continue" "breakpoint 2.*" "break2 with many checkpoints"
 
-gdb_test "info checkpoints" " 600 .* 0 .*" \
-    "info checkpoints with at least 600 checkpoints"
+set count 0
+set msg "info checkpoints with at least 600 checkpoints"
+gdb_test_multiple "info checkpoints" $msg {
+    -re "  $decimal process \[^\r\]*\r\n" {
+	incr count
+	exp_continue
+    }
+    -re "$gdb_prompt $" {
+	if { $count >= 600 } {
+	    pass $msg
+	} else {
+	    fail $msg
+	}
+    }
+}    
 
 #
 # OK, kill 'em all...
-- 
2.11.0