From 70bcd4bc7eef9d23485716a2e96262d02ec58e66 Mon Sep 17 00:00:00 2001
From: Stan Shebs <shebs@codesourcery.com>
Date: Wed, 24 Aug 1994 02:21:37 +0000
Subject: [PATCH] 	* lib/gdb.exp (gdb_run_cmd): Move comment out from
 between expect 	patterns, since that is not a valid context for
 comments.

---
 gdb/testsuite/ChangeLog   | 10 ++++++++++
 gdb/testsuite/lib/gdb.exp | 24 +++++++++++++-----------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f23b91b..525f540 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+Tue Aug 23 19:14:06 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* lib/gdb.exp (gdb_run_cmd): Move comment out from between expect
+	patterns, since that is not a valid context for comments.
+
+Fri Aug 19 15:07:30 1994  Kung Hsu  (kung@mexican.cygnus.com)
+
+	* gdb.c++/demangle.exp (test_arm_style_demangling): Add tests for
+	repeated types and repeated types with indices > 9.
+
 Tue Aug 16 15:57:52 1994  Stan Shebs  (shebs@andros.cygnus.com)
 
 	* gdb.base/printcmds.exp: Remove all the a29k XFAILs tagged with
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index f6764d0..cb54c954 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -113,7 +113,11 @@ proc delete_breakpoints {} {
 
 
 #
+# Generic run command.
 #
+# The second pattern below matches up to the first newline *only*.
+# Using ``.*$'' could swallow up output that we attempt to match
+# elsewhere.
 #
 proc gdb_run_cmd {} {
     send "run\n"
@@ -122,10 +126,6 @@ proc gdb_run_cmd {} {
 	    send "y\n"
 	    exp_continue
 	}
-
-	# The following pattern matches up to to the first newline *only*.
-	# Using ``.*$'' could swallow up output that we attempt to match
-	# elsewhere.
 	-re "Starting program: \[^\n\]*" {}
     }
 }
@@ -221,13 +221,15 @@ proc gdb_test { args } {
 
     set result -1
     set errmess ""
-    # trap the send so any problems don't crash things
-    catch "send \"$command\n\"" errmess
-    if [string match "write.spawn_id=\[0-9\]+.:" $errmess] then {
-	perror "sent \"$command\" got expect error \"$errmess\""
-	catch "close"
-	gdb_start
-	return -1
+    if ![string match $command ""] {
+	# trap the send so any problems don't crash things
+	catch "send \"$command\n\"" errmess
+	if [string match "write.spawn_id=\[0-9\]+.:" $errmess] then {
+	    perror "sent \"$command\" got expect error \"$errmess\""
+	    catch "close"
+	    gdb_start
+	    return -1
+	}
     }
 
     expect {
-- 
2.7.4