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.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54656 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 4 insertions, 3 deletions

diff --git a/test/lib/test/unit/assertions.rb b/test/lib/test/unit/assertions.rb
index 8eb805744e..4396503447 100644
--- a/test/lib/test/unit/assertions.rb
+++ b/test/lib/test/unit/assertions.rb
@@ -490,6 +490,7 @@ EOT
           catch {|tag| eval(code, binding, fname, line)}
         end
         assert_match(error, e.message, mesg)
+        e
       ensure
         $VERBOSE = verbose
       end
diff --git a/version.h b/version.h
index 0c60c78bf2..5bc6e48865 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #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"