aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--test/rdoc/test_rdoc_markup_pre_process.rb10
2 files changed, 7 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index f97e535551..20be1d4a47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jun 6 14:35:48 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * test/rdoc/test_rdoc_markup_pre_process.rb (TestRDocMarkupPreProcess#
+ {test_include_file,test_include_file_encoding_incompatible}): no
+ need to write such workaround. don't hide the bug of ruby (and the
+ bug is already fixed)
+
Mon Jun 6 14:11:11 2011 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/date/date_core.c (valid_jd_sub): need to convert from VALUE to
diff --git a/test/rdoc/test_rdoc_markup_pre_process.rb b/test/rdoc/test_rdoc_markup_pre_process.rb
index 0d2e8565be..9fff53df77 100644
--- a/test/rdoc/test_rdoc_markup_pre_process.rb
+++ b/test/rdoc/test_rdoc_markup_pre_process.rb
@@ -40,11 +40,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/ && RUBY_PLATFORM =~ /mswin|mingw/
-
assert_equal expected, content
end
@@ -64,11 +59,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/ && RUBY_PLATFORM =~ /mswin|mingw/
-
assert_equal expected, content
end