diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-03-05 07:51:31 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-03-05 07:51:31 +0000 |
| commit | 842c6f605bdd87bc931b1426bd9f1ea3ca1ba3dd (patch) | |
| tree | 2d94071dee6c37131c4c159286bddc9530d8ea74 | |
| parent | bfba60f8fea397e1cb0e2860d43294dbd1a070e4 (diff) | |
* 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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34906 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | test/ruby/test_sleep.rb | 2 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Mon Mar 5 16:50:22 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. + Mon Mar 5 12:44:12 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * st.c (unpack_entries): chain entries directly. based on a patch diff --git a/test/ruby/test_sleep.rb b/test/ruby/test_sleep.rb index a4a24ee860..61004d3b5f 100644 --- a/test/ruby/test_sleep.rb +++ b/test/ruby/test_sleep.rb @@ -6,7 +6,7 @@ class TestSleep < Test::Unit::TestCase start = Time.now sleep 5 slept = Time.now-start - bottom = /Linux ([\d.]+)/ =~ `uname -sr` && ($1.split('.')<=>%w/2 6.18/<1 ? 4.99 : 5.0 + 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 |