yugui	2011-05-29 08:31:53 +0900 (Sun, 29 May 2011)

  New Revision: 31771

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31771

  Log:
    merges r31016 from trunk into ruby_1_9_2.
    --
    * test/ruby/test_process.rb (test_execopts_redirect): redirecting fd
      >= 3 is not supported on Windows, so should not specify such options
      when calling spawn or others.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/test/ruby/test_process.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 31770)
+++ ruby_1_9_2/ChangeLog	(revision 31771)
@@ -1,3 +1,9 @@
+Thu Mar  3 21:21:42 2011  NAKAMURA Usaku  <usa@r...>
+
+	* test/ruby/test_process.rb (test_execopts_redirect): redirecting fd
+	  >= 3 is not supported on Windows, so should not specify such options
+	  when calling spawn or others.
+
 Sat May 14 12:20:22 2011  Yuki Sonoda (Yugui)  <yugui@y...>
 
 	* strftime.c (STRFTIME):  return 0 and ERANGE when precision is too
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 31770)
+++ ruby_1_9_2/version.h	(revision 31771)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 209
+#define RUBY_PATCHLEVEL 210
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
Index: ruby_1_9_2/test/ruby/test_process.rb
===================================================================
--- ruby_1_9_2/test/ruby/test_process.rb	(revision 31770)
+++ ruby_1_9_2/test/ruby/test_process.rb	(revision 31771)
@@ -382,13 +382,17 @@
         Process.wait Process.spawn(*ECHO["d"], f=>STDOUT, STDOUT=>f)
         assert_equal("d", File.read("out").chomp)
       }
-      Process.wait Process.spawn(*ECHO["e"], STDOUT=>["out", File::WRONLY|File::CREAT|File::TRUNC, 0644],
-                                 3=>STDOUT, 4=>STDOUT, 5=>STDOUT, 6=>STDOUT, 7=>STDOUT)
+      opts = {STDOUT=>["out", File::WRONLY|File::CREAT|File::TRUNC, 0644]}
+      if /mswin|mingw/ !~ RUBY_PLATFORM
+        opts.merge(3=>STDOUT, 4=>STDOUT, 5=>STDOUT, 6=>STDOUT, 7=>STDOUT)
+      end
+      Process.wait Process.spawn(*ECHO["e"], opts)
       assert_equal("e", File.read("out").chomp)
-      Process.wait Process.spawn(*ECHO["ee"], STDOUT=>["out", File::WRONLY|File::CREAT|File::TRUNC, 0644],
-                                 3=>0, 4=>:in, 5=>STDIN,
-                                 6=>1, 7=>:out, 8=>STDOUT,
-                                 9=>2, 10=>:err, 11=>STDERR)
+      opts = {STDOUT=>["out", File::WRONLY|File::CREAT|File::TRUNC, 0644]}
+      if /mswin|mingw/ !~ RUBY_PLATFORM
+        opts.merge(3=>0, 4=>:in, 5=>STDIN, 6=>1, 7=>:out, 8=>STDOUT, 9=>2, 10=>:err, 11=>STDERR)
+      end
+      Process.wait Process.spawn(*ECHO["ee"], opts)
       assert_equal("ee", File.read("out").chomp)
       if /mswin|mingw/ !~ RUBY_PLATFORM
         # passing non-stdio fds is not supported on Windows

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/