nagachika	2016-11-24 05:48:33 +0900 (Thu, 24 Nov 2016)

  New Revision: 56888

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

  Log:
    merge revision(s) 56884: [Backport #12910]
    
    test_fileutils.rb: Use primary group too
    
    * test/fileutils/test_fileutils.rb (TestFileUtils#setup): Use
      primary group as well as supplementary groups.  based on the
      patch by Vit Ondruch at [ruby-core:78053].  [Bug #12910]
    
    It might happen in certain environments (systemd-nspawn) that
    process has no supplementary groups, but primary groups should be
    enough to pass most of the tests.

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/test/fileutils/test_fileutils.rb
    branches/ruby_2_3/version.h
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 56887)
+++ ruby_2_3/ChangeLog	(revision 56888)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Thu Nov 24 05:47:18 2016  CHIKANAGA Tomoyuki  <nagachika@r...>
+
+	* test/fileutils/test_fileutils.rb (TestFileUtils#setup): Use primary
+	  group as well as supplementary groups.
+	  based on the patch by Vit Ondruch at [Bug #12910]
+
 Thu Nov 24 05:44:04 2016  CHIKANAGA Tomoyuki  <nagachika@r...>
 
 	* test/ruby/test_dir_m17n.rb: Don't encode to UTF-8 if it's unnecessary.
Index: ruby_2_3/test/fileutils/test_fileutils.rb
===================================================================
--- ruby_2_3/test/fileutils/test_fileutils.rb	(revision 56887)
+++ ruby_2_3/test/fileutils/test_fileutils.rb	(revision 56888)
@@ -144,7 +144,7 @@ class TestFileUtils < Test::Unit::TestCa https://github.com/ruby/ruby/blob/trunk/ruby_2_3/test/fileutils/test_fileutils.rb#L144
 
   def setup
     @prevdir = Dir.pwd
-    @groups = Process.groups if have_file_perm?
+    @groups = [Process.gid] | Process.groups if have_file_perm?
     tmproot = TMPROOT
     mymkdir tmproot unless File.directory?(tmproot)
     Dir.chdir tmproot
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 56887)
+++ ruby_2_3/version.h	(revision 56888)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.3"
 #define RUBY_RELEASE_DATE "2016-11-24"
-#define RUBY_PATCHLEVEL 223
+#define RUBY_PATCHLEVEL 224
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 11

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r56884


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