usa	2016-11-12 07:39:15 +0900 (Sat, 12 Nov 2016)

  New Revision: 56729

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=56729

  Log:
    merge revision(s) 56684: [Backport #12909]
    
    test_process.rb: fix pgroup test
    
    * test/ruby/test_process.rb (TestProcess#test_execopts_pgroup):
      use dynamically assigned pid for the process group, instead of a
      magic number 2.  [ruby-core:78051] [Bug #12909]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/test/ruby/test_process.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/test/ruby/test_process.rb
===================================================================
--- ruby_2_2/test/ruby/test_process.rb	(revision 56728)
+++ ruby_2_2/test/ruby/test_process.rb	(revision 56729)
@@ -180,7 +180,11 @@ class TestProcess < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/ruby/test_process.rb#L180
     io.close
 
     assert_raise(ArgumentError) { system(*TRUECOMMAND, :pgroup=>-1) }
-    assert_raise(Errno::EPERM) { Process.wait spawn(*TRUECOMMAND, :pgroup=>2) }
+    IO.popen([RUBY, '-egets'], 'w') do |f|
+      assert_raise(Errno::EPERM) {
+        Process.wait spawn(*TRUECOMMAND, :pgroup=>f.pid)
+      }
+    end
 
     io1 = IO.popen([RUBY, "-e", "print Process.getpgrp", :pgroup=>true])
     io2 = IO.popen([RUBY, "-e", "print Process.getpgrp", :pgroup=>io1.pid])
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 56728)
+++ ruby_2_2/version.h	(revision 56729)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.6"
 #define RUBY_RELEASE_DATE "2016-11-12"
-#define RUBY_PATCHLEVEL 387
+#define RUBY_PATCHLEVEL 388
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 11

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r56684


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