nagachika	2015-12-01 02:53:50 +0900 (Tue, 01 Dec 2015)

  New Revision: 52805

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

  Log:
    merge partially revision(s) 52391:
    
    explicitly overwrite signal handling

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/test/ruby/test_gc.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 52804)
+++ ruby_2_2/ChangeLog	(revision 52805)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Dec  1 02:52:17 2015  CHIKANAGA Tomoyuki  <nagachika@r...>
+
+	* test/ruby/test_gc.rb: merge partially r52391 to get rid of CI error.
+
 Tue Dec  1 02:27:41 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* io.c (rb_io_each_codepoint): raise an exception at incomplete
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 52804)
+++ ruby_2_2/version.h	(revision 52805)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.4"
 #define RUBY_RELEASE_DATE "2015-12-01"
-#define RUBY_PATCHLEVEL 215
+#define RUBY_PATCHLEVEL 216
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 12
Index: ruby_2_2/test/ruby/test_gc.rb
===================================================================
--- ruby_2_2/test/ruby/test_gc.rb	(revision 52804)
+++ ruby_2_2/test/ruby/test_gc.rb	(revision 52805)
@@ -334,6 +334,7 @@ class TestGc < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/ruby/test_gc.rb#L334
   def test_interrupt_in_finalizer
     bug10595 = '[ruby-core:66825] [Bug #10595]'
     src = <<-'end;'
+      Signal.trap(:INT, 'DEFAULT')
       pid = $$
       Thread.start do
         10.times {

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r52391


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