merge revision(s) 49660:

	test_file.rb: just skip assertion

	* test/ruby/test_file.rb (TestFile#test_stat): skip an assertion
  only, not making the entire test skipped

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

2 files changed, 7 insertions, 5 deletions

diff --git a/test/ruby/test_file.rb b/test/ruby/test_file.rb
index 16b76b71fe..601d19efcd 100644
--- a/test/ruby/test_file.rb
+++ b/test/ruby/test_file.rb
@@ -334,8 +334,10 @@ class TestFile < Test::Unit::TestCase
       if stat.birthtime != stat.ctime
         assert_in_delta t0+4, stat.ctime.to_f, delta
       end
-      skip "Windows delays updating atime" if /mswin|mingw/ =~ RUBY_PLATFORM
-      assert_in_delta t0+6, stat.atime.to_f, delta
+      unless /mswin|mingw/ =~ RUBY_PLATFORM
+        # Windows delays updating atime
+        assert_in_delta t0+6, stat.atime.to_f, delta
+      end
     }
   rescue NotImplementedError
   end
diff --git a/version.h b/version.h
index efa4d2bd3f..cdeba15a3f 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.2.0"
-#define RUBY_RELEASE_DATE "2015-02-21"
-#define RUBY_PATCHLEVEL 73
+#define RUBY_RELEASE_DATE "2015-02-22"
+#define RUBY_PATCHLEVEL 74
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 21
+#define RUBY_RELEASE_DAY 22
 
 #include "ruby/version.h"