nagachika	2016-03-29 00:42:34 +0900 (Tue, 29 Mar 2016)

  New Revision: 54324

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

  Log:
    merge revision(s) 51930: [Backport #12149]
    
    * test/gdbm/test_gdbm.rb (TestGDBM#test_s_open_lock): skip
      this test on AIX. The issue is the same as on Solaris.
      [ruby-dev:47631]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/test/gdbm/test_gdbm.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 54323)
+++ ruby_2_2/ChangeLog	(revision 54324)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Mar 29 00:42:10 2016  Rei Odaira  <Rei.Odaira@g...>
+
+	* test/gdbm/test_gdbm.rb (TestGDBM#test_s_open_lock): skip
+	  this test on AIX. The issue is the same as on Solaris.
+	  [ruby-dev:47631]
+
 Tue Mar 29 00:33:06 2016  Rei Odaira  <Rei.Odaira@g...>
 
 	* thread_pthread.c (getstack): __pi_stacksize returned by
Index: ruby_2_2/test/gdbm/test_gdbm.rb
===================================================================
--- ruby_2_2/test/gdbm/test_gdbm.rb	(revision 54323)
+++ ruby_2_2/test/gdbm/test_gdbm.rb	(revision 54324)
@@ -146,7 +146,7 @@ if defined? GDBM https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/gdbm/test_gdbm.rb#L146
     end
 
     def test_s_open_lock
-      skip "GDBM.open would block when opening already locked gdbm file on platforms without flock and with lockf" if /solaris/ =~ RUBY_PLATFORM
+      skip "GDBM.open would block when opening already locked gdbm file on platforms without flock and with lockf" if /solaris|aix/ =~ RUBY_PLATFORM
 
       dbname = "#{@tmpdir}/#{@prefix}"
 
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 54323)
+++ ruby_2_2/version.h	(revision 54324)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.5"
 #define RUBY_RELEASE_DATE "2016-03-29"
-#define RUBY_PATCHLEVEL 266
+#define RUBY_PATCHLEVEL 267
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3

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


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