From: Jim Blandy <jimb@codesourcery.com>
Date: Fri, 18 Jun 2004 23:12:54 +0000 (+0000)
Subject: * gdb.base/charset.exp: Only send a control-C if we see a new
X-Git-Tag: gdb_6_2-2004-07-10-gmt-branchpoint~201
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b9d7eb68dafe6773af41be3cb771967743e992c7;p=pf3gnuchains%2Fpf3gnuchains4x.git

* gdb.base/charset.exp: Only send a control-C if we see a new
prompt and incomplete command.
---

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 6627335500..afd7121406 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-18  Jim Blandy  <jimb@redhat.com>
+
+	* gdb.base/charset.exp: Only send a control-C if we see a new
+	prompt and incomplete command.
+
 2004-06-18  Michael Chastain  <mec.gnu@mindspring.com>
 
 	* gdb.cp/pr-574.cc: Add copyright notice.
diff --git a/gdb/testsuite/gdb.base/charset.exp b/gdb/testsuite/gdb.base/charset.exp
index 95021b41db..588bf059c7 100644
--- a/gdb/testsuite/gdb.base/charset.exp
+++ b/gdb/testsuite/gdb.base/charset.exp
@@ -140,7 +140,7 @@ gdb_expect {
 	# We got some output that ended with a regular prompt
         fail "get valid character sets"
     }
-    -re "^set charset.*$" {
+    -re ".*$gdb_prompt set charset.*$" {
 	# We got some other output, send a cntrl-c to gdb to get us back
         # to the prompt.
 	send_gdb "\003"