naruse	2016-03-30 01:36:44 +0900 (Wed, 30 Mar 2016)

  New Revision: 54419

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

  Log:
    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.

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/test/ruby/test_file.rb
    branches/ruby_2_3/version.h
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 54418)
+++ ruby_2_3/version.h	(revision 54419)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #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
Index: ruby_2_3/test/ruby/test_file.rb
===================================================================
--- ruby_2_3/test/ruby/test_file.rb	(revision 54418)
+++ ruby_2_3/test/ruby/test_file.rb	(revision 54419)
@@ -268,7 +268,11 @@ class TestFile < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_3/test/ruby/test_file.rb#L268
       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)
 

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r53673


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