usa	2016-03-25 17:45:47 +0900 (Fri, 25 Mar 2016)

  New Revision: 54270

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

  Log:
    merge revision(s) 47837: [Backport #12155]
    
    * test/ruby/test_process.rb (TestProcess#test_setsid): AIX
      does not allow Process::getsid(pid) when pid is in a
      different session.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/test/ruby/test_process.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 54269)
+++ ruby_2_1/version.h	(revision 54270)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.9"
 #define RUBY_RELEASE_DATE "2016-03-25"
-#define RUBY_PATCHLEVEL 467
+#define RUBY_PATCHLEVEL 468
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_1/test/ruby/test_process.rb
===================================================================
--- ruby_2_1/test/ruby/test_process.rb	(revision 54269)
+++ ruby_2_1/test/ruby/test_process.rb	(revision 54270)
@@ -1689,9 +1689,9 @@ class TestProcess < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/ruby/test_process.rb#L1689
   def test_setsid
     return unless Process.respond_to?(:setsid)
     return unless Process.respond_to?(:getsid)
-    # OpenBSD doesn't allow Process::getsid(pid) when pid is in
+    # OpenBSD and AIX don't allow Process::getsid(pid) when pid is in
     # different session.
-    return if /openbsd/ =~ RUBY_PLATFORM
+    return if /openbsd|aix/ =~ RUBY_PLATFORM
 
     IO.popen([RUBY, "-e", <<EOS]) do|io|
 	Marshal.dump(Process.getsid, STDOUT)
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 54269)
+++ ruby_2_1/ChangeLog	(revision 54270)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Fri Mar 25 17:45:36 2016  Rei Odaira  <Rei.Odaira@g...>
+
+	* test/ruby/test_process.rb (TestProcess#test_setsid): AIX
+	  does not allow Process::getsid(pid) when pid is in a
+	  different session.
+
 Fri Mar 25 17:42:34 2016  Rei Odaira  <Rei.Odaira@g...>
 
 	* test/ruby/test_process.rb (test_execopts_gid): Skip a test

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r47837


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