merge revision(s) 34897,34904,34906,34931:

	Old linux (at least CentOS 5.6, kernel 2.6.18) wakes up 4.99 sec.
	* 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/branches/ruby_1_9_3@35238 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 10 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 4a85063dfd..eaa1e5e548 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/version.h b/version.h
index deceac871a..2c79e24091 100644
--- a/version.h
+++ b/version.h
@@ -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