diff options
-rw-r--r-- | test/fileutils/test_fileutils.rb | 14 | ||||
-rw-r--r-- | version.h | 4 |
2 files changed, 10 insertions, 8 deletions
diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb index f74ae5a755..c81f5b40dc 100644 --- a/test/fileutils/test_fileutils.rb +++ b/test/fileutils/test_fileutils.rb @@ -741,12 +741,14 @@ class TestFileUtils < Test::Unit::TestCase 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' @@ -1,10 +1,10 @@ #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" |