merge revision(s) 53673: [Backport #12229]

	* test/ruby/test_file.rb (TestFile#test_realpath_encoding): rescue Errno::EACCES
  and skip the testcase because it'll be raised on Windows always unless the
  runner doesn't have the administrator privilege.


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

2 files changed, 6 insertions, 2 deletions

diff --git a/test/ruby/test_file.rb b/test/ruby/test_file.rb
index 88b934d8ef..f5a00f9e17 100644
--- a/test/ruby/test_file.rb
+++ b/test/ruby/test_file.rb
@@ -268,7 +268,11 @@ class TestFile < Test::Unit::TestCase
       realdir = File.realpath(tmpdir)
       open(File.join(tmpdir, tst), "w") {}
       a = File.join(tmpdir, "x")
-      File.symlink(tst, a)
+      begin
+        File.symlink(tst, a)
+      rescue Errno::EACCES
+        skip "need privilege"
+      end
       assert_equal(File.join(realdir, tst), File.realpath(a))
       File.unlink(a)
 
diff --git a/version.h b/version.h
index 6770bc4b04..2a28bb7483 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.3.0"
 #define RUBY_RELEASE_DATE "2016-03-30"
-#define RUBY_PATCHLEVEL 67
+#define RUBY_PATCHLEVEL 68
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3