naruse	2012-04-04 18:29:43 +0900 (Wed, 04 Apr 2012)

  New Revision: 35238

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

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

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/ruby/test_sleep.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 35237)
+++ ruby_1_9_3/ChangeLog	(revision 35238)
@@ -1,3 +1,10 @@
+Wed Apr  4 18:29:15 2012  NAKAMURA Usaku  <usa@r...>
+
+	* 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@r...>
 
 	* ext/-test-/add_suffix/bug.c: make all functions in util.c static
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 35237)
+++ ruby_1_9_3/version.h	(revision 35238)
@@ -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
Index: ruby_1_9_3/test/ruby/test_sleep.rb
===================================================================
--- ruby_1_9_3/test/ruby/test_sleep.rb	(revision 35237)
+++ ruby_1_9_3/test/ruby/test_sleep.rb	(revision 35238)
@@ -6,7 +6,8 @@
     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

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