naruse	2015-02-22 02:15:55 +0900 (Sun, 22 Feb 2015)

  New Revision: 49676

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

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

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/test/ruby/test_file.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49675)
+++ ruby_2_2/version.h	(revision 49676)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #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"
 
Index: ruby_2_2/test/ruby/test_file.rb
===================================================================
--- ruby_2_2/test/ruby/test_file.rb	(revision 49675)
+++ ruby_2_2/test/ruby/test_file.rb	(revision 49676)
@@ -334,8 +334,10 @@ class TestFile < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/ruby/test_file.rb#L334
       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

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49660


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