kosaki	2011-08-31 05:28:10 +0900 (Wed, 31 Aug 2011)

  New Revision: 33135

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

  Log:
    merge revision(s) 33130:
    
    * ext/-test-/old_thread_select/old_thread_select.c (old_thread_select):
      typo.
    
    * test/-ext-/old_thread_select/test_old_thread_select.rb
      (TestOldThreadSelect#test_old_select_signal_safe): use SIGINT instead
      of SIGUSR1 because the former is general and the latter is platform
      dependent.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/-test-/old_thread_select/old_thread_select.c
    branches/ruby_1_9_3/test/-ext-/old_thread_select/test_old_thread_select.rb

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 33134)
+++ ruby_1_9_3/ChangeLog	(revision 33135)
@@ -1,3 +1,13 @@
+Wed Aug 31 05:27:59 2011  NAKAMURA Usaku  <usa@r...>
+
+	* ext/-test-/old_thread_select/old_thread_select.c (old_thread_select):
+	  typo.
+
+	* test/-ext-/old_thread_select/test_old_thread_select.rb
+	  (TestOldThreadSelect#test_old_select_signal_safe): use SIGINT instead
+	  of SIGUSR1 because the former is general and the latter is platform
+	  dependent.
+
 Wed Aug 31 05:26:30 2011  NAKAMURA Usaku  <usa@r...>
 
 	* win32/win32.c, include/ruby/intern.h (rb_w32_fd_copy): implement
Index: ruby_1_9_3/ext/-test-/old_thread_select/old_thread_select.c
===================================================================
--- ruby_1_9_3/ext/-test-/old_thread_select/old_thread_select.c	(revision 33134)
+++ ruby_1_9_3/ext/-test-/old_thread_select/old_thread_select.c	(revision 33135)
@@ -41,7 +41,7 @@
     }
     rp = array2fdset(&rfds, r, &max);
     wp = array2fdset(&wfds, w, &max);
-    ep = array2fdset(&efds, w, &max);
+    ep = array2fdset(&efds, e, &max);
     rc = rb_thread_select(max, rp, wp, ep, tvp);
     if (rc == -1)
 	rb_sys_fail("rb_wait_for_single_fd");
Index: ruby_1_9_3/test/-ext-/old_thread_select/test_old_thread_select.rb
===================================================================
--- ruby_1_9_3/test/-ext-/old_thread_select/test_old_thread_select.rb	(revision 33134)
+++ ruby_1_9_3/test/-ext-/old_thread_select/test_old_thread_select.rb	(revision 33135)
@@ -41,12 +41,12 @@
 
   def test_old_select_signal_safe
     return unless Process.respond_to?(:kill)
-    usr1 = false
-    trap(:USR1) { usr1 = true }
+    received = false
+    trap(:INT) { received = true }
     main = Thread.current
     thr = Thread.new do
       Thread.pass until main.stop?
-      Process.kill(:USR1, $$)
+      Process.kill(:INT, $$)
       true
     end
 
@@ -62,8 +62,8 @@
     assert diff >= 1.0, "interrupted or short wait"
     assert_equal 0, rc
     assert_equal true, thr.value
-    assert usr1, "USR1 not received"
+    assert received, "SIGINT not received"
     ensure
-      trap(:USR1, "DEFAULT")
+      trap(:INT, "DEFAULT")
   end
 end

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