2000-12-21 Michael Snyder <msnyder@mvstp600e.cygnus.com>

        * gdb.base/finish.exp: Accept '1' instead of \001 from char_func.
        Add a RE to accept a non-ascii char if one is ever presented.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 91e3f19..c598a07 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-21  Michael Snyder  <msnyder@mvstp600e.cygnus.com>
+
+       * gdb.base/finish.exp: Accept '1' instead of \001 from char_func.
+       Add a RE to accept a non-ascii char if one is ever presented.
+
 2000-12-20  Fernando Nasser  <fnasser@redhat.com>
 
        * lib/mi-support.exp (mi_gdb_start): Test for MI_OUT, not UI_OUT.

diff --git a/gdb/testsuite/gdb.base/finish.exp b/gdb/testsuite/gdb.base/finish.exp
index c329fc4..3e8c5ca 100644 (file)
--- a/gdb/testsuite/gdb.base/finish.exp
+++ b/gdb/testsuite/gdb.base/finish.exp
@@ -43,11 +43,18 @@ proc finish_1 { type } {
            "continue to ${type}_func"
     send_gdb "finish\n"
     gdb_expect {
-       -re ".*Value returned is .* = 1 '.001'\r\n$gdb_prompt $" {
+       -re ".*Value returned is .* = 49 '1'\r\n$gdb_prompt $" {
            if { $type == "char" } {
                pass "finish from char_func"
            } else {
-               fail "finish from char_func"
+               fail "finish from ${type}_func"
+           }
+       }
+       -re ".*Value returned is .* = \[0123456789\]* '1'\r\n$gdb_prompt $" {
+           if { $type == "char" } {
+               pass "finish from char_func (non-ASCII char set?)"
+           } else {
+               fail "finish from ${type}_func"
            }
        }
        -re ".*Value returned is .* = 1\r\n$gdb_prompt $" {