* test/ruby/test_file_exhaustive.rb (test_lchmod): merge mistake of r55347.

  (cf. [Backport #12340])


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

2 files changed, 2 insertions, 2 deletions

diff --git a/test/ruby/test_file_exhaustive.rb b/test/ruby/test_file_exhaustive.rb
index 5197ddb04e..5296eb01fd 100644
--- a/test/ruby/test_file_exhaustive.rb
+++ b/test/ruby/test_file_exhaustive.rb
@@ -459,7 +459,7 @@ class TestFileExhaustive < Test::Unit::TestCase
     [@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
diff --git a/version.h b/version.h
index a1c678dfd5..108d77240e 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #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