nagachika	2014-05-11 00:01:24 +0900 (Sun, 11 May 2014)

  New Revision: 45908

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

  Log:
    merge revision(s) r45901:
    
    envutil.rb: successfully terminated process
    
    * test/ruby/envutil.rb (FailDesc): allow successfully terminated
      process without a signal.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/test/ruby/envutil.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 45907)
+++ ruby_2_1/version.h	(revision 45908)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
-#define RUBY_RELEASE_DATE "2014-05-10"
-#define RUBY_PATCHLEVEL 96
+#define RUBY_RELEASE_DATE "2014-05-11"
+#define RUBY_PATCHLEVEL 97
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 10
+#define RUBY_RELEASE_DAY 11
 
 #include "ruby/version.h"
 
Index: ruby_2_1/test/ruby/envutil.rb
===================================================================
--- ruby_2_1/test/ruby/envutil.rb	(revision 45907)
+++ ruby_2_1/test/ruby/envutil.rb	(revision 45908)
@@ -251,9 +251,10 @@ module Test https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/ruby/envutil.rb#L251
         pid = status.pid
         now = Time.now
         faildesc = proc do
-          signo = status.termsig
-          signame = Signal.signame(signo)
-          sigdesc = "signal #{signo}"
+          if signo = status.termsig
+            signame = Signal.signame(signo)
+            sigdesc = "signal #{signo}"
+          end
           log = EnvUtil.diagnostic_reports(signame, EnvUtil.rubybin, pid, now)
           if signame
             sigdesc = "SIG#{signame} (#{sigdesc})"

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r45901


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