summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/rdoc/test_rdoc_encoding.rb12
2 files changed, 5 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index bc27f6f5c8..43cd3b8153 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb 9 09:45:43 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * test/rdoc/test_rdoc_encoding.rb: remove unnecessary (and wrong)
+ platform-dependent hacks.
+
Wed Feb 9 00:47:18 2011 Tanaka Akira <akr@fsij.org>
* ext/etc/etc.c: parenthesize macro arguments.
diff --git a/test/rdoc/test_rdoc_encoding.rb b/test/rdoc/test_rdoc_encoding.rb
index f6c113affc..178f805129 100644
--- a/test/rdoc/test_rdoc_encoding.rb
+++ b/test/rdoc/test_rdoc_encoding.rb
@@ -26,9 +26,6 @@ class TestRDocEncoding < MiniTest::Unit::TestCase
@tempfile.write expected
@tempfile.flush
- # FIXME 1.9 fix on windoze
- expected.gsub!("\n", "\r\n") if RUBY_VERSION =~ /^1.9/ && RUBY_PLATFORM =~ /mswin|mingw/
-
contents = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8
assert_equal "hi everybody", contents
assert_equal Encoding::UTF_8, contents.encoding
@@ -55,9 +52,6 @@ class TestRDocEncoding < MiniTest::Unit::TestCase
@tempfile.write "# coding: utf-8\n\317\200" # pi
@tempfile.flush
- # FIXME 1.9 fix on windoze
- expected.gsub!("\n", "\r\n") if RUBY_VERSION =~ /^1.9/ && RUBY_PLATFORM =~ /mswin|mingw/
-
contents = :junk
_, err = capture_io do
@@ -78,9 +72,6 @@ class TestRDocEncoding < MiniTest::Unit::TestCase
@tempfile.write expected
@tempfile.flush
- # FIXME 1.9 fix on windoze
- expected.gsub!("\n", "\r\n") if RUBY_VERSION =~ /^1.9/ && RUBY_PLATFORM =~ /win32|mingw32/
-
contents = RDoc::Encoding.read_file @tempfile.path, Encoding::UTF_8
assert_equal "hi everybody", contents
assert_equal Encoding::UTF_8, contents.encoding
@@ -92,9 +83,6 @@ class TestRDocEncoding < MiniTest::Unit::TestCase
@tempfile.write "# coding: utf-8\n\317\200" # pi
@tempfile.flush
- # FIXME 1.9 fix on windoze
- expected.gsub!("\n", "\r\n") if RUBY_VERSION =~ /^1.9/ && RUBY_PLATFORM =~ /mswin|mingw/
-
contents = RDoc::Encoding.read_file @tempfile.path, Encoding::US_ASCII, true
assert_equal '?', contents