aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/gdb.base/charset.exp4
2 files changed, 7 insertions, 2 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8f42cc6..1748549 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-17 Pedro Alves <pedro@codesourcery.com>
+
+ * gdb.base/charset.exp: Don't assume new `regsub' syntax
+ available.
+
2010-02-16 Daniel Jacobowitz <dan@codesourcery.com>
* gdb.xml/tdesc-arch.exp, gdb.xml/tdesc-regs.exp: Rewrite file
diff --git a/gdb/testsuite/gdb.base/charset.exp b/gdb/testsuite/gdb.base/charset.exp
index 6b6f3b7..9820632 100644
--- a/gdb/testsuite/gdb.base/charset.exp
+++ b/gdb/testsuite/gdb.base/charset.exp
@@ -140,7 +140,7 @@ send_gdb "set host-charset\n"
gdb_expect {
-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 {,}]
+ regsub -all {, } $host_charset_list {,} host_charset_list
foreach host_charset [split $host_charset_list ","] {
set charsets($host_charset) 1
}
@@ -168,7 +168,7 @@ send_gdb "set target-charset\n"
gdb_expect {
-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 {,}]
+ regsub -all {, } $target_charset_list {,} target_charset_list
foreach target_charset [split $target_charset_list ","] {
if {! [info exists charsets($target_charset)]} {
set charsets($target_charset) 0