aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-21 02:56:17 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-21 02:56:17 +0000
commit7a34e08d847ab72508c8714bfc76687e00a750f6 (patch)
treef5bbb131cc31c73e33178bd7775965bf08ec565f
parent0530cf9ff88c13a69c95519139f75b87d097707c (diff)
downloadruby-7a34e08d847ab72508c8714bfc76687e00a750f6.tar.gz
* test/ruby/test_m17n.rb (TestM17N::test_tr): "invalid mbstring
sequence" is not an error to be tested. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14381 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog2
-rw-r--r--test/ruby/test_m17n.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a9ebbfd403..17b9bd00f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -73,6 +73,8 @@ Fri Dec 21 00:26:39 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* test/ruby/test_m17n.rb (TestM17N::test_tr_s): "invalid mbstring
sequence" is not an error to be tested.
+ * test/ruby/test_m17n.rb (TestM17N::test_tr): ditto.
+
Thu Dec 20 19:29:07 2007 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/imap.rb (initialize): the second argument is an option
diff --git a/test/ruby/test_m17n.rb b/test/ruby/test_m17n.rb
index 1923d9294e..e262e1812c 100644
--- a/test/ruby/test_m17n.rb
+++ b/test/ruby/test_m17n.rb
@@ -1623,7 +1623,7 @@ class TestM17N < Test::Unit::TestCase
#puts "#{encdump s1}.tr(#{encdump s2}, #{encdump s3})"
t = s1.tr(s2, s3)
rescue ArgumentError
- e = $!
+ e = $! unless /mbstring sequence/ =~ $!.message
end
if e
encs = []