diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-24 13:46:04 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-24 13:46:04 +0000 |
commit | cafc5a30805e647d7920343cc7056d95263f58b8 (patch) | |
tree | 92aa673c75956611d76dc2b2dcfa6cbeb7dd70f0 /test | |
parent | 57b26f83051d13442ffa6269230ea9d5803b6d1b (diff) |
merge revision(s) 43376: [Backport #9038]
* encoding.c (load_encoding): should preserve outer errinfo, so that
expected exception may not be lost. [ruby-core:57949] [Bug #9038]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43414 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/ruby/test_encoding.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/test/ruby/test_encoding.rb b/test/ruby/test_encoding.rb index ef2dc39c4d..82f1a306f0 100644 --- a/test/ruby/test_encoding.rb +++ b/test/ruby/test_encoding.rb @@ -113,4 +113,12 @@ class TestEncoding < Test::Unit::TestCase asc = "b".force_encoding(Encoding::US_ASCII) assert_equal(Encoding::ASCII_8BIT, Encoding.compatible?(bin, asc)) end + + def test_errinfo_after_autoload + bug9038 = '[ruby-core:57949] [Bug #9038]' + assert_separately(%w[--disable=gems], <<-"end;") + e = assert_raise(SyntaxError) { eval("/regexp/sQ") } + assert_match(/unknown regexp option - Q/, e.message, #{bug9038.dump}) + end; + end end |