diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-23 03:44:55 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-23 03:44:55 +0000 |
| commit | b053b9780945720e7e548d07b2caef8a18c84e66 (patch) | |
| tree | 28e31c0fca32643fc2ec8e9ce55917483b7c1246 /test | |
| parent | b05d8841fcb36de8ddbeda2df3c8b628982c237c (diff) | |
* test/ruby/test_regexp.rb (test_dup_warn): read in UTF-8
encoding regardless environment.
* test/ruby/envutil.rb (invoke_ruby): add encoding option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28397 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/ruby/envutil.rb | 4 | ||||
| -rw-r--r-- | test/ruby/test_regexp.rb | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index 1824e548ed..7e52a8ffd7 100644 --- a/test/ruby/envutil.rb +++ b/test/ruby/envutil.rb @@ -76,6 +76,10 @@ module EnvUtil opt[:in] = in_c opt[:out] = out_c if capture_stdout opt[:err] = err_c if capture_stderr + if enc = opt.delete(:encoding) + out_p.set_encoding(enc) if out_p + err_p.set_encoding(enc) if err_p + end case args.first when Hash child_env = [args.shift] diff --git a/test/ruby/test_regexp.rb b/test/ruby/test_regexp.rb index 3324a9e8d9..9fd948d6a1 100644 --- a/test/ruby/test_regexp.rb +++ b/test/ruby/test_regexp.rb @@ -819,9 +819,11 @@ class TestRegexp < Test::Unit::TestCase end def test_dup_warn - assert_in_out_err('-w', 'x=/[\u3042\u3041]/', [], /\A\z/) - assert_in_out_err('-w', 'x=/[\u3042\u3042]/', [], /duplicated/) - assert_in_out_err('-w', 'x=/[\u3042\u3041-\u3043]/', [], /duplicated/) + assert_in_out_err(%w/-w -U/, "#coding:utf-8\nx=/[\u3042\u3041]/\n!x", [], []) + assert_in_out_err(%w/-w -U/, "#coding:utf-8\nx=/[\u3042\u3042]/\n!x", [], /duplicated/u, nil, + encoding: Encoding::UTF_8) + assert_in_out_err(%w/-w -U/, "#coding:utf-8\nx=/[\u3042\u3041-\u3043]/\n!x", [], /duplicated/u, nil, + encoding: Encoding::UTF_8) end def test_property_warn |