* 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 66273355009bce9359a5d0ac0defb02a803db6c0..afd7121406acff90e3f81c85cd5deb038b44076f 100644 (file)
--- 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 95021b41db23833f3c8bcd99b01ef52f76603d02..588bf059c77ce6d7d2fc47a69f5d34bdbe48d543 100644 (file)
--- 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"