merge revision(s) 33365: [Backport #8106]

	* test/ruby/test_bignum.rb (TestBignum#test_interrupt): fix for
  faster CPU.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@40052 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 7 insertions, 5 deletions

diff --git a/test/ruby/test_bignum.rb b/test/ruby/test_bignum.rb
index 4343f3fdbf..582a7b2366 100644
--- a/test/ruby/test_bignum.rb
+++ b/test/ruby/test_bignum.rb
@@ -491,7 +491,7 @@ class TestBignum < Test::Unit::TestCase
     assert_equal(true, (2**32).even?)
   end
 
-  def interrupt
+  def assert_interrupt
     time = Time.now
     start_flag = false
     end_flag = false
@@ -500,14 +500,16 @@ class TestBignum < Test::Unit::TestCase
       yield
       end_flag = true
     end
-    sleep 1
+    Thread.pass until start_flag
     thread.raise
     thread.join rescue nil
-    start_flag && !end_flag && Time.now - time < 10
+    time = Time.now - time
+    assert_equal([true, false], [start_flag, end_flag])
+    assert_operator(time, :<, 10)
   end
 
   def test_interrupt
-    assert(interrupt { (65536 ** 65536).to_s })
+    assert_interrupt {(65536 ** 65536).to_s}
   end
 
   def test_too_big_to_s
diff --git a/version.h b/version.h
index feaecd5c39..62aaf948f3 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 403
+#define RUBY_PATCHLEVEL 404
 
 #define RUBY_RELEASE_DATE "2013-04-02"
 #define RUBY_RELEASE_YEAR 2013