1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test_readline.rb: try UTF-8

Browse Source 
* test/readline/test_readline.rb (test_completion_encoding),
  (test_input_metachar_multibyte): try to run under UTF-8 locale,
  before skipping.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40332 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-04-17 05:20:18 +00:00
parent a24b6d3f67
commit 385de15d55
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/readline/test_readline.rb
View File

@ -291,7 +291,10 @@ class TestReadline < Test::Unit::TestCase
else else
results = %W"\xa1\xa1 \xa1\xa2".map {|s| s.force_encoding(locale)} results = %W"\xa1\xa1 \xa1\xa2".map {|s| s.force_encoding(locale)}
end or end or
begin
return if assert_under_utf8
skip("missing test for locale #{locale.name}") skip("missing test for locale #{locale.name}")
end
expected = results[0][0...1] expected = results[0][0...1]
Readline.completion_case_fold = false Readline.completion_case_fold = false
assert_equal(expected, with_pipe {|r, w| w << "\t"}, bug5941) assert_equal(expected, with_pipe {|r, w| w << "\t"}, bug5941)
@ -417,7 +420,10 @@ class TestReadline < Test::Unit::TestCase
end if !/EditLine/n.match(Readline::VERSION) end if !/EditLine/n.match(Readline::VERSION)
def test_input_metachar_multibyte def test_input_metachar_multibyte
skip 'this test needs UTF-8 locale' unless Encoding.find("locale") == Encoding::UTF_8 unless Encoding.find("locale") == Encoding::UTF_8
return if assert_under_utf8
skip 'this test needs UTF-8 locale'
end
bug6602 = '[ruby-core:45683]' bug6602 = '[ruby-core:45683]'
Readline::HISTORY << "\u3042\u3093" Readline::HISTORY << "\u3042\u3093"
Readline::HISTORY << "\u3044\u3093" Readline::HISTORY << "\u3044\u3093"
@ -496,4 +502,15 @@ class TestReadline < Test::Unit::TestCase
def get_default_internal_encoding def get_default_internal_encoding
return Encoding.default_internal || Encoding.find("locale") return Encoding.default_internal || Encoding.find("locale")
end end
def assert_under_utf8
return false if ENV['LC_ALL'] == 'UTF-8'
loc = caller_locations(1, 1)[0].base_label.to_s
require_relative "../ruby/envutil"
assert_separately([{"LC_ALL"=>"UTF-8"}, "-r", __FILE__], <<SRC)
#skip "test \#{ENV['LC_ALL']}"
#{self.class.name}.new(#{loc.dump}).run(Test::Unit::Runner.new)
SRC
return true
end
end if defined?(::Readline) end if defined?(::Readline)