mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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
This commit is contained in:
parent
4a670c2bb6
commit
10957cd1cc
2 changed files with 7 additions and 5 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue