merges r20530 from trunk into ruby_1_9_1.

* test/ruby/test_process.rb: skip some tests on win32.

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

1 files changed, 13 insertions, 7 deletions

diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
index ba933b2d5..5a95a52f0 100644
--- a/test/ruby/test_process.rb
+++ b/test/ruby/test_process.rb
@@ -127,6 +127,7 @@ class TestProcess < Test::Unit::TestCase
   end
 
   def test_execopts_pgroup
+    skip "system(:pgroup) is not supported" if /mswin|bccwin|mingw/ =~ RUBY_PLATFORM
     assert_nothing_raised { system(*TRUECOMMAND, :pgroup=>false) }
 
     io = IO.popen([RUBY, "-e", "print Process.getpgrp"])
@@ -461,6 +462,7 @@ class TestProcess < Test::Unit::TestCase
   end
 
   def test_fd_inheritance
+    skip "inheritance of fd>=3 is not supported" if /mswin|bccwin|mingw/ =~ RUBY_PLATFORM
     with_pipe {|r, w|
       system(RUBY, '-e', 'IO.new(ARGV[0].to_i).puts(:ba)', w.fileno.to_s)
       w.close
@@ -564,14 +566,18 @@ class TestProcess < Test::Unit::TestCase
   end
 
   def test_execopts_redirect_self
-    with_pipe {|r, w|
-      w << "haha\n"
-      w.close
-      r.close_on_exec = true
-      IO.popen([RUBY, "-e", "print IO.new(#{r.fileno}).read", r.fileno=>r.fileno, :close_others=>false]) {|io|
-        assert_equal("haha\n", io.read)
+    begin
+      with_pipe {|r, w|
+        w << "haha\n"
+        w.close
+        r.close_on_exec = true
+        IO.popen([RUBY, "-e", "print IO.new(#{r.fileno}).read", r.fileno=>r.fileno, :close_others=>false]) {|io|
+          assert_equal("haha\n", io.read)
+        }
       }
-    }
+    rescue NotImplementedError
+      skip "IO#close_on_exec= is not supported"
+    end
   end
 
   def test_execopts_duplex_io