nagachika	2017-03-28 00:49:01 +0900 (Tue, 28 Mar 2017)

  New Revision: 58164

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=58164

  Log:
    merge revision(s) 57492: [Backport #12405]
    
    test_queue.rb: fix portability
    
    * test/thread/test_queue.rb (test_queue_with_trap): fix
      portability.  use SIGINT instead of SIGUSR2 which is supported
      on not all platforms.

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/test/thread/test_queue.rb
    branches/ruby_2_3/version.h
Index: ruby_2_3/test/thread/test_queue.rb
===================================================================
--- ruby_2_3/test/thread/test_queue.rb	(revision 58163)
+++ ruby_2_3/test/thread/test_queue.rb	(revision 58164)
@@ -543,14 +543,14 @@ class TestQueue < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_3/test/thread/test_queue.rb#L543
   end
 
   def test_queue_with_trap
-    assert_in_out_err([], <<-INPUT, %w(USR2 USR2 exit), [])
+    assert_in_out_err([], <<-INPUT, %w(INT INT exit), [])
       q = Queue.new
-      trap(:USR2){
-        q.push 'USR2'
+      trap(:INT){
+        q.push 'INT'
       }
       Thread.new{
         loop{
-          Process.kill :USR2, $$
+          Process.kill :INT, $$
         }
       }
       puts q.pop
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 58163)
+++ ruby_2_3/version.h	(revision 58164)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.3"
 #define RUBY_RELEASE_DATE "2017-03-28"
-#define RUBY_PATCHLEVEL 273
+#define RUBY_PATCHLEVEL 274
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r57492


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