From f9664eb3c797e4c6ec4061f74996dfac737d407f Mon Sep 17 00:00:00 2001 From: nagachika Date: Wed, 23 Nov 2016 20:48:33 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@56888 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ test/fileutils/test_fileutils.rb | 2 +- version.h | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fe4769b9af..3e1034839e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Nov 24 05:47:18 2016 CHIKANAGA Tomoyuki + + * 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 * test/ruby/test_dir_m17n.rb: Don't encode to UTF-8 if it's unnecessary. diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb index f5ca9d21e2..2640eb2094 100644 --- a/test/fileutils/test_fileutils.rb +++ b/test/fileutils/test_fileutils.rb @@ -144,7 +144,7 @@ class TestFileUtils < Test::Unit::TestCase 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 diff --git a/version.h b/version.h index e689d0ed89..6657436a29 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #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