OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdb/testsuite/ 

* gdb.base/charset.exp: Use a single regular expression to match
	show host-charset and show target-charset output.
This commit is contained in:
Daniel Jacobowitz 2010-02-16 20:13:14 +00:00
parent d66a7a7bd2
commit b519e2a636
2 changed files with 19 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2010-02-16 Daniel Jacobowitz <dan@codesourcery.com>
* gdb.base/charset.exp: Use a single regular expression to match
show host-charset and show target-charset output.
2010-02-15 Jan Kratochvil <jan.kratochvil@redhat.com>
* gdb.base/attach.exp (attach to nonsense is prohibited): Make the

47
gdb/testsuite/gdb.base/charset.exp
View File

@ -138,28 +138,19 @@ proc valid_target_charset {charset} {
send_gdb "set host-charset\n"
gdb_expect {
-re "Requires an argument. Valid arguments are (\[^ \t\n\r,.\]*)" {
#set host_charset_list $expect_out(1,string)
set charsets($expect_out(1,string)) 1
exp_continue
#pass "capture valid host charsets"
}
-re ", (\[^ \t\n\r,.\]*)" {
#set host_charset_list $expect_out(1,string)
set charsets($expect_out(1,string)) 1
exp_continue
#pass "capture valid host charsets"
}
-re "\\.\r\n$gdb_prompt $" {
#set host_charset_list $expect_out(1,string)
-re "Requires an argument. Valid arguments are (.*)\\.\r\n$gdb_prompt $" {
set host_charset_list $expect_out(1,string)
set host_charset_list [regsub -all {, } $host_charset_list {,}]
foreach host_charset [split $host_charset_list ","] {
set charsets($host_charset) 1
}
pass "capture valid host charsets"
}
-re ".*$gdb_prompt $" {
fail "capture valid host charsets"
}
timeout {
fail "(timeout) capture valid host charsets"
}
@ -175,25 +166,15 @@ if {[llength [array names charsets]] < 3} {
send_gdb "set target-charset\n"
gdb_expect {
-re "Requires an argument. Valid arguments are (\[^ \t\n\r,.\]*)" {
set target_charset $expect_out(1,string)
if {! [info exists charsets($target_charset)]} {
set charsets($target_charset) 0
-re "Requires an argument. Valid arguments are (.*)\\.\r\n$gdb_prompt $" {
set target_charset_list $expect_out(1,string)
set target_charset_list [regsub -all {, } $target_charset_list {,}]
foreach target_charset [split $target_charset_list ","] {
if {! [info exists charsets($target_charset)]} {
set charsets($target_charset) 0
}
}
exp_continue
}
-re ", (\[^ \t\n\r,.\]*)" {
set target_charset $expect_out(1,string)
if {! [info exists charsets($target_charset)]} {
set charsets($target_charset) 0
}
exp_continue
}
-re "\\.\r\n$gdb_prompt $" {
pass "capture valid target charsets"
}
-re ".*$gdb_prompt $" {