* gdb.base/funcargs.exp: Avoid ever setting more than 8

	breakpoints in the inferior at any given time by making
	two groups of breakpoints for call2*, call6* and call7*
	tests.

2 files changed, 26 insertions, 7 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index a2b9691..80209f9 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+Tue Aug 22 00:30:37 1995  Jeff Law  (law@snake.cs.utah.edu)
+
+	* gdb.base/funcargs.exp: Avoid ever setting more than 8
+	breakpoints in the inferior at any given time by making
+	two groups of breakpoints for call2*, call6* and call7*
+	tests.
+
 Sun Aug 20 06:58:25 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 
 	* gdb.base/funcargs.exp:  Fix typos introduced by Aug 15 change.
diff --git a/gdb/testsuite/gdb.base/funcargs.exp b/gdb/testsuite/gdb.base/funcargs.exp
index fe4d4dc..8ec8d31 100644
--- a/gdb/testsuite/gdb.base/funcargs.exp
+++ b/gdb/testsuite/gdb.base/funcargs.exp
@@ -171,7 +171,6 @@ proc float_and_integral_args {} {
     send "break call2f\n" ; expect -re ".*$prompt $"
     send "break call2g\n" ; expect -re ".*$prompt $"
     send "break call2h\n" ; expect -re ".*$prompt $"
-    send "break call2i\n" ; expect -re ".*$prompt $"
 
     # Run; should stop at call2a and print actual arguments.
 
@@ -233,6 +232,11 @@ proc float_and_integral_args {} {
 	return
     }
 
+    # monitor only allows 8 breakpoints; w89k board allows 10, so
+    # break them up into two groups.
+    delete_breakpoints
+    send "break call2i\n" ; expect -re ".*$prompt $"
+
     # Continue; should stop at call2i and print actual arguments.
     if [gdb_test "cont" ".* call2i \\(c1=97 'a', f1=4, c2=97 'a', c3=97 'a', d1=5, c4=97 'a', c5=97 'a', c6=97 'a', f2=4, s=1, c7=97 'a', d2=5\\) .*" "continue to call2i"] {
 	return
@@ -395,9 +399,6 @@ proc discard_and_shuffle {} {
     send "break call6f\n" ; expect -re ".*$prompt $"
     send "break call6g\n" ; expect -re ".*$prompt $"
     send "break call6h\n" ; expect -re ".*$prompt $"
-    send "break call6i\n" ; expect -re ".*$prompt $"
-    send "break call6j\n" ; expect -re ".*$prompt $"
-    send "break call6k\n" ; expect -re ".*$prompt $"
 
     # Run; should stop at call6a and print actual arguments.
     # Print backtrace.
@@ -591,6 +592,13 @@ $prompt $" { pass "backtrace from call6h" }
 	timeout { fail "(timeout) backtrace from call6h" ; return }
     }
 
+    # monitor only allows 8 breakpoints; w89k board allows 10, so
+    # break them up into two groups.
+    delete_breakpoints
+    send "break call6i\n" ; expect -re ".*$prompt $"
+    send "break call6j\n" ; expect -re ".*$prompt $"
+    send "break call6k\n" ; expect -re ".*$prompt $"
+
     # Continue; should stop at call6i and print actual arguments.
     # Print backtrace.
 
@@ -704,9 +712,6 @@ proc shuffle_round_robin {} {
     send "break call7f\n" ; expect -re ".*$prompt $"
     send "break call7g\n" ; expect -re ".*$prompt $"
     send "break call7h\n" ; expect -re ".*$prompt $"
-    send "break call7i\n" ; expect -re ".*$prompt $"
-    send "break call7j\n" ; expect -re ".*$prompt $"
-    send "break call7k\n" ; expect -re ".*$prompt $"
 
     # Run; should stop at call7a and print actual arguments.
     # Print backtrace.
@@ -932,6 +937,13 @@ $prompt $" { pass "backtrace from call7i" }
 	timeout { fail "(timeout) backtrace from call7i" ; return }
     }
 
+    # monitor only allows 8 breakpoints; w89k board allows 10, so
+    # break them up into two groups.
+    delete_breakpoints
+    send "break call7i\n" ; expect -re ".*$prompt $"
+    send "break call7j\n" ; expect -re ".*$prompt $"
+    send "break call7k\n" ; expect -re ".*$prompt $"
+
     # Continue; should stop at call7j and print actual arguments.
     # Print backtrace.