gdb/testsuite/

	* gdb.base/charset.exp: Use a single regular expression to match
	show host-charset and show target-charset output.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 6196c587db376ecc7050bdf8871f9e33ce7ffece..eaff2110ee4642c35240a80d40ca08393f898f0f 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -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

diff --git a/gdb/testsuite/gdb.base/charset.exp b/gdb/testsuite/gdb.base/charset.exp
index d1d010d0863bb805b81e67048af38644a3eaead7..6b6f3b75c062fe5479455462fb378e22d71e62a0 100644 (file)
--- a/gdb/testsuite/gdb.base/charset.exp
+++ b/gdb/testsuite/gdb.base/charset.exp
@@ -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
-       }
-       exp_continue
-    }
-
-    -re ", (\[^ \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 "\\.\r\n$gdb_prompt $" {
        pass "capture valid target charsets"
-
     }
 
     -re ".*$gdb_prompt $" {