nagachika	2016-04-21 04:21:27 +0900 (Thu, 21 Apr 2016)

  New Revision: 54656

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

  Log:
    merge revision(s) 54653:
    
    assertions.rb: return the exception
    
    * test/lib/test/unit/assertions.rb (assert_syntax_error): return
      the rescued exception object as well as assert_raise.

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/test/lib/test/unit/assertions.rb
    branches/ruby_2_3/version.h
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 54655)
+++ ruby_2_3/version.h	(revision 54656)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.0"
-#define RUBY_RELEASE_DATE "2016-04-19"
-#define RUBY_PATCHLEVEL 95
+#define RUBY_RELEASE_DATE "2016-04-21"
+#define RUBY_PATCHLEVEL 96
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 19
+#define RUBY_RELEASE_DAY 21
 
 #include "ruby/version.h"
 
Index: ruby_2_3/test/lib/test/unit/assertions.rb
===================================================================
--- ruby_2_3/test/lib/test/unit/assertions.rb	(revision 54655)
+++ ruby_2_3/test/lib/test/unit/assertions.rb	(revision 54656)
@@ -490,6 +490,7 @@ EOT https://github.com/ruby/ruby/blob/trunk/ruby_2_3/test/lib/test/unit/assertions.rb#L490
           catch {|tag| eval(code, binding, fname, line)}
         end
         assert_match(error, e.message, mesg)
+        e
       ensure
         $VERBOSE = verbose
       end

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


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