merge revision(s) 66973: [Backport #15577]

	Run r66972 assertion only when a sticky-bit makes sense

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67210 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 7 insertions, 6 deletions

diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb
index 64dd2464c0..f74ae5a755 100644
--- a/test/fileutils/test_fileutils.rb
+++ b/test/fileutils/test_fileutils.rb
@@ -742,13 +742,14 @@ class TestFileUtils < Test::Unit::TestCase
     assert_file_not_exist 'tmp/tmpdir/c'
 
     File.chmod(01777, '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'
+    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
 
     Dir.rmdir 'tmp/tmpdir'
-
   end
 
   def test_remove_entry_secure_symlink
diff --git a/version.h b/version.h
index 83830331a5..4a278a6fe7 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.6.1"
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 43
+#define RUBY_PATCHLEVEL 44
 
 #define RUBY_RELEASE_YEAR 2019
 #define RUBY_RELEASE_MONTH 3