From 6413ee42db02bf41428713c63cfaab4dfb551ebb Mon Sep 17 00:00:00 2001
From: Kung Hsu <kung@cygnus>
Date: Fri, 31 Mar 1995 00:43:47 +0000
Subject: [PATCH]         * lib/gdb.exp (gdb_run_cmd): Special handling for
 targets use stubs.         * gdb.base/break.exp: ditto.         *
 gdb.base/list.exp: ditto.         * gdb.base/bitfields.c: Add #ifdef usestubs
 in main().         * gdb.base/run.c: ditto.         * gdb.base/list0.c:
 ditto.         * gdb.base/funcargs.c: ditto.

---
 gdb/testsuite/ChangeLog          | 10 ++++++++++
 gdb/testsuite/gdb.base/break.exp |  5 +----
 gdb/testsuite/gdb.base/list.exp  |  8 ++++++++
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 0eaadcf3644..b6a32b02b88 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+Thu Mar 30 15:36:55 1995  Kung Hsu  <kung@mexican.cygnus.com>
+
+	* lib/gdb.exp (gdb_run_cmd): Special handling for targets use stubs.
+	* gdb.base/break.exp: ditto.
+	* gdb.base/list.exp: ditto.
+	* gdb.base/bitfields.c: Add #ifdef usestubs in main().
+	* gdb.base/run.c: ditto.
+	* gdb.base/list0.c: ditto.
+	* gdb.base/funcargs.c: ditto.
+
 Wed Mar 29 17:09:29 1995  Stu Grossman  (grossman@cygnus.com)
 
 	* testsuite/config/rom68k.exp (gdb_target_rom68k):  Use
diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp
index 5fb51fb7a86..1b53a2b1e0d 100644
--- a/gdb/testsuite/gdb.base/break.exp
+++ b/gdb/testsuite/gdb.base/break.exp
@@ -143,10 +143,7 @@ if !$usestubs then {
   }
 }
 
-if $usestubs {
-    gdb_test $cmd "Starting program.*Breakpoint \[0-9\]+,.*main .*argc.*argv.* at .*$srcfile:56.*56\[\t \]+if .argc.*" \
-	"run until function breakpoint"
-}
+#if $usestubs {}
 
 #
 # run until the breakpoint at a line number
diff --git a/gdb/testsuite/gdb.base/list.exp b/gdb/testsuite/gdb.base/list.exp
index 25c30c436d1..16214c941f3 100644
--- a/gdb/testsuite/gdb.base/list.exp
+++ b/gdb/testsuite/gdb.base/list.exp
@@ -900,6 +900,14 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load $objdir/$subdir/$binfile
 
+if $usestubs {
+    send "step\n"
+    # if use stubs step out of the breakpoint() function.
+    expect {
+        -re "main.* at .*$prompt $" {}
+        timeout { fail "single step at breakpoint() (timeout)" ; return 0 }
+    }
+
 send "set width 0\n"
 expect -re "$prompt $"
 
-- 
2.30.2