diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | test/ruby/test_sleep.rb | 3 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Wed Apr 4 18:29:15 2012 NAKAMURA Usaku <usa@ruby-lang.org> + + * test/ruby/test_sleep.rb (TestSleep#test_sleep_5sec): syntax error. + + * test/ruby/test_sleep.rb (TestSleep#test_sleep_5sec): call uname + only on linux because it's a workaround for linux only. + Wed Apr 4 11:32:09 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/-test-/add_suffix/bug.c: make all functions in util.c static diff --git a/test/ruby/test_sleep.rb b/test/ruby/test_sleep.rb index 96c38fde5a..989ced92c7 100644 --- a/test/ruby/test_sleep.rb +++ b/test/ruby/test_sleep.rb @@ -6,7 +6,8 @@ class TestSleep < Test::Unit::TestCase start = Time.now sleep 5 slept = Time.now-start - assert_operator(5.0, :<=, slept) + bottom = /linux/ =~ RUBY_PLATFORM && /Linux ([\d.]+)/ =~ `uname -sr` && ($1.split('.')<=>%w/2 6 18/)<1 ? 4.99 : 5.0 + assert_operator(bottom, :<=, slept) assert_operator(slept, :<=, 6.0, "[ruby-core:18015]: longer than expected") ensure GC.enable @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 175 +#define RUBY_PATCHLEVEL 176 #define RUBY_RELEASE_DATE "2012-04-04" #define RUBY_RELEASE_YEAR 2012 |