merge from trunk (r19984, r19985, r19991-r19998)

	* io.c (extract_binmode): new function to extract binmode/textmode
	  options from hash.

	* io.c (rb_io_extract_modeenc): use above function.

	* io.c (rb_io_s_pipe): recognize binmode/textmode options.

	* io.c (make_readconv): now can specify the size of cbuf.

	* io.c (read_all, appendline, io_getc, rb_io_ungetc): follow above
	  change.

	* win32/win32.c (rb_w32_pipe_exec): internal fds should be always
	  binmode.

	* test/ruby/test_file.rb (test_each_char_extended_file,
	  test_getbyte_extended_file): add tests.

	* test/ruby/test_file.rb (test_*_extended_file): test in default/text/
	  binary mode.

	* test/ruby/test_file.rb (test_para_gets_extended_file): output file
	  should be binmode.

	* test/ruby/test_io.rb (test_copy_stream, test_copy_stream_socket): skip
	  some tests if there isn't IO#nonblock=.

	* test/ruby/test_io.rb (test_close_on_exec): skip if there isn't
	  IO#close_on_exec=.

	* test/ruby/test_io.rb (test_bytes, test_readbyte): depend on binmode.

	* test/ruby/test_io.rb (test_sysopen): should specify the mode of
	  IO::for_fd if F_GETFL is not available.

	* test/ruby/test_io_m17n.rb (test_getc_invalid3): should set binmode if 
	  enc is not compatible with ASCII.

	* test/ruby/test_require.rb (test_require_too_long_filename): too long
	  commandline may be rejected by OS.



git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@19999 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 52 insertions, 22 deletions

diff --git a/test/ruby/test_file.rb b/test/ruby/test_file.rb
index f6fcf89a1..0732c76a8 100644
--- a/test/ruby/test_file.rb
+++ b/test/ruby/test_file.rb
@@ -65,40 +65,70 @@ class TestFile < Test::Unit::TestCase
   end
 
   def test_read_all_extended_file
-    f = Tempfile.new("test-extended-file")
-    assert_nil(f.getc)
-    open(f.path, "w") {|g| g.print "a" }
-    assert_equal("a", f.read)
+    [nil, {:textmode=>true}, {:binmode=>true}].each do |mode|
+      f = Tempfile.new("test-extended-file", mode)
+      assert_nil(f.getc)
+      open(f.path, "w") {|g| g.print "a" }
+      assert_equal("a", f.read, "mode = <#{mode}>")
+    end
   end
 
   def test_gets_extended_file
-    f = Tempfile.new("test-extended-file")
-    assert_nil(f.getc)
-    open(f.path, "w") {|g| g.print "a" }
-    assert_equal("a", f.gets("a"))
+    [nil, {:textmode=>true}, {:binmode=>true}].each do |mode|
+      f = Tempfile.new("test-extended-file", mode)
+      assert_nil(f.getc)
+      open(f.path, "w") {|g| g.print "a" }
+      assert_equal("a", f.gets("a"), "mode = <#{mode}>")
+    end
   end
 
   def test_gets_para_extended_file
-    f = Tempfile.new("test-extended-file")
-    assert_nil(f.getc)
-    open(f.path, "w") {|g| g.print "\na" }
-    assert_equal("a", f.gets(""))
+    [nil, {:textmode=>true}, {:binmode=>true}].each do |mode|
+      f = Tempfile.new("test-extended-file", mode)
+      assert_nil(f.getc)
+      open(f.path, "wb") {|g| g.print "\na" }
+      assert_equal("a", f.gets(""), "mode = <#{mode}>")
+    end
+  end
+
+  def test_each_char_extended_file
+    [nil, {:textmode=>true}, {:binmode=>true}].each do |mode|
+      f = Tempfile.new("test-extended-file", mode)
+      assert_nil(f.getc)
+      open(f.path, "w") {|g| g.print "a" }
+      result = []
+      f.each_char {|b| result << b }
+      assert_equal([?a], result, "mode = <#{mode}>")
+    end
   end
 
   def test_each_byte_extended_file
-    f = Tempfile.new("test-extended-file")
-    assert_nil(f.getc)
-    open(f.path, "w") {|g| g.print "a" }
-    result = []
-    f.each_byte {|b| result << b.chr }
-    assert_equal([?a], result)
+    [nil, {:textmode=>true}, {:binmode=>true}].each do |mode|
+      f = Tempfile.new("test-extended-file", mode)
+      assert_nil(f.getc)
+      open(f.path, "w") {|g| g.print "a" }
+      result = []
+      f.each_byte {|b| result << b.chr }
+      assert_equal([?a], result, "mode = <#{mode}>")
+    end
   end
 
   def test_getc_extended_file
-    f = Tempfile.new("test-extended-file")
-    assert_nil(f.getc)
-    open(f.path, "w") {|g| g.print "a" }
-    assert_equal(?a, f.getc)
+    [nil, {:textmode=>true}, {:binmode=>true}].each do |mode|
+      f = Tempfile.new("test-extended-file", mode)
+      assert_nil(f.getc)
+      open(f.path, "w") {|g| g.print "a" }
+      assert_equal(?a, f.getc, "mode = <#{mode}>")
+    end
+  end
+
+  def test_getbyte_extended_file
+    [nil, {:textmode=>true}, {:binmode=>true}].each do |mode|
+      f = Tempfile.new("test-extended-file", mode)
+      assert_nil(f.getc)
+      open(f.path, "w") {|g| g.print "a" }
+      assert_equal(?a, f.getbyte.chr, "mode = <#{mode}>")
+    end
   end
 
   def test_s_chown