From 315f8b0e915af8849346008a8cda74d79301ad22 Mon Sep 17 00:00:00 2001 From: Michael Snyder Date: Fri, 22 Dec 2000 01:49:46 +0000 Subject: [PATCH] 2000-12-21 Michael Snyder * 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. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.base/finish.exp | 11 +++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 91e3f19..c598a07 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2000-12-21 Michael Snyder + + * 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 * 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 --- 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 $" { -- 2.7.4