diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-14 07:55:37 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-14 07:55:37 +0000 |
| commit | 39432526b68e90906f25742b2736a2b2141f2d2d (patch) | |
| tree | 3f232a2aff8e6e61f591f9d799a9e6a19ff2e29b /test | |
| parent | ac81a6e38d85ad623f699d4ed8dd319b5fb28d32 (diff) | |
merge revision(s) 33902:
* lib/rdoc/encoding.rb (RDoc::Encoding.read_file): fixup newline chars
on Windows.
see https://github.com/rdoc/rdoc/issues/87
* test/rdoc/test_rdoc_markup_pre_process.rb
(TestRDocMarkupPreProcess#test_include_file,
TestRDocMarkupPreProcess#test_include_file_encoding_incompatible):
follow above change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/rdoc/test_rdoc_markup_pre_process.rb | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/test/rdoc/test_rdoc_markup_pre_process.rb b/test/rdoc/test_rdoc_markup_pre_process.rb index 9a0a302b3e..34867c8c6b 100644 --- a/test/rdoc/test_rdoc_markup_pre_process.rb +++ b/test/rdoc/test_rdoc_markup_pre_process.rb @@ -43,11 +43,6 @@ Regular expressions (<i>regexp</i>s) are patterns which describe the contents of a string. EXPECTED - # FIXME 1.9 fix on windoze - # preprocessor uses binread, so line endings are \r\n - expected.gsub!("\n", "\r\n") if - RUBY_VERSION < "1.9.3" && RUBY_PLATFORM =~ /mswin|mingw/ - assert_equal expected, content end @@ -67,11 +62,6 @@ contents of a string. expected = "?\n" - # FIXME 1.9 fix on windoze - # preprocessor uses binread, so line endings are \r\n - expected.gsub!("\n", "\r\n") if - RUBY_VERSION < "1.9.3" && RUBY_PLATFORM =~ /mswin|mingw/ - assert_equal expected, content end |