usa	2016-06-10 22:06:18 +0900 (Fri, 10 Jun 2016)

  New Revision: 55367

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

  Log:
    * test/ruby/test_file_exhaustive.rb (test_lchmod): merge mistake of r55347.
      (cf. [Backport #12340])

  Modified files:
    branches/ruby_2_2/test/ruby/test_file_exhaustive.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 55366)
+++ ruby_2_2/version.h	(revision 55367)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.6"
 #define RUBY_RELEASE_DATE "2016-06-10"
-#define RUBY_PATCHLEVEL 339
+#define RUBY_PATCHLEVEL 340
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 6
Index: ruby_2_2/test/ruby/test_file_exhaustive.rb
===================================================================
--- ruby_2_2/test/ruby/test_file_exhaustive.rb	(revision 55366)
+++ ruby_2_2/test/ruby/test_file_exhaustive.rb	(revision 55367)
@@ -459,7 +459,7 @@ class TestFileExhaustive < Test::Unit::T https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/ruby/test_file_exhaustive.rb#L459
     [@file, @utf8_file].each do |file|
       assert_equal(1, File.lchmod(0444, file))
       assert_equal(0444, File.stat(file).mode % 01000)
-      File.lchmod(0600, regular_file)
+      File.lchmod(0600, file)
     end
     assert_raise(Errno::ENOENT) { File.lchmod(0600, @nofile) }
   rescue NotImplementedError

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