yugui	2010-01-30 21:49:35 +0900 (Sat, 30 Jan 2010)

  New Revision: 26492

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

  Log:
    merges r25392 from trunk into ruby_1_9_1.
    --
    Retry until the signal is trapped.

  Modified files:
    branches/ruby_1_9_1/test/ruby/test_signal.rb
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 26491)
+++ ruby_1_9_1/version.h	(revision 26492)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 397
+#define RUBY_PATCHLEVEL 398
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
Index: ruby_1_9_1/test/ruby/test_signal.rb
===================================================================
--- ruby_1_9_1/test/ruby/test_signal.rb	(revision 26491)
+++ ruby_1_9_1/test/ruby/test_signal.rb	(revision 26492)
@@ -17,7 +17,10 @@
       x = 0
       oldtrap = Signal.trap(:INT) {|sig| x = 2 }
       Process.kill :INT, Process.pid
-      sleep 0.1
+      10.times do
+        break if 2 == x
+        sleep 0.1
+      end
       assert_equal 2, x
 
       Signal.trap(:INT) { raise "Interrupt" }

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