naruse	2019-03-28 12:24:57 +0900 (Thu, 28 Mar 2019)

  New Revision: 67351

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

  Log:
    merge revision(s) 67247: [Backport #15666]
    
    Guard out the test when it is run under root permission

  Modified directories:
    branches/ruby_2_6/
  Modified files:
    branches/ruby_2_6/test/fileutils/test_fileutils.rb
    branches/ruby_2_6/version.h
Index: ruby_2_6/version.h
===================================================================
--- ruby_2_6/version.h	(revision 67350)
+++ ruby_2_6/version.h	(revision 67351)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_6/version.h#L1
 #define RUBY_VERSION "2.6.3"
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 48
+#define RUBY_PATCHLEVEL 49
 
 #define RUBY_RELEASE_YEAR 2019
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 14
+#define RUBY_RELEASE_DAY 28
 
 #include "ruby/version.h"
 
Index: ruby_2_6/test/fileutils/test_fileutils.rb
===================================================================
--- ruby_2_6/test/fileutils/test_fileutils.rb	(revision 67350)
+++ ruby_2_6/test/fileutils/test_fileutils.rb	(revision 67351)
@@ -741,12 +741,14 @@ class TestFileUtils < Test::Unit::TestCa https://github.com/ruby/ruby/blob/trunk/ruby_2_6/test/fileutils/test_fileutils.rb#L741
     assert_file_not_exist 'tmp/tmpdir/a'
     assert_file_not_exist 'tmp/tmpdir/c'
 
-    File.chmod(01777, 'tmp/tmpdir')
-    if File.sticky?('tmp/tmpdir')
-      Dir.mkdir 'tmp/tmpdir/d', 0
-      assert_raise(Errno::EACCES) {remove_entry_secure 'tmp/tmpdir/d'}
-      File.chmod 0777, 'tmp/tmpdir/d'
-      Dir.rmdir 'tmp/tmpdir/d'
+    unless root_in_posix?
+      File.chmod(01777, 'tmp/tmpdir')
+      if File.sticky?('tmp/tmpdir')
+        Dir.mkdir 'tmp/tmpdir/d', 0
+        assert_raise(Errno::EACCES) {remove_entry_secure 'tmp/tmpdir/d'}
+        File.chmod 0777, 'tmp/tmpdir/d'
+        Dir.rmdir 'tmp/tmpdir/d'
+      end
     end
 
     Dir.rmdir 'tmp/tmpdir'
Index: ruby_2_6
===================================================================
--- ruby_2_6	(revision 67350)
+++ ruby_2_6	(revision 67351)

Property changes on: ruby_2_6
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r67247

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