summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-25 13:33:40 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-25 13:33:40 +0000
commitfd9134e5e742a6c7a224ff719594a5ade6d0cd77 (patch)
tree27ffde483fb0d0ffac5f659964a8e6a2e601dba1
parent8e095cea57a5a6d05a1e34654ad4f772c434fbe8 (diff)
* KNOWNBUGS.rb: if an exception is raised in hooks, need to raise the exception
in the hooked context. it's 1.8's behavior. see r38601 in trunk. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38602 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--KNOWNBUGS.rb2
-rw-r--r--version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/KNOWNBUGS.rb b/KNOWNBUGS.rb
index 9bd0227..e89c8d4 100644
--- a/KNOWNBUGS.rb
+++ b/KNOWNBUGS.rb
@@ -3,5 +3,5 @@
# So all tests will cause failure.
#
-assert_equal('ok', "set_trace_func(proc{|t,|raise if t == 'line'})\n""1\n'ok'")
+assert_equal('', "set_trace_func(proc{|t,|raise if t == 'line'})\n""1\n'ok'")
assert_finish(3, "def m; end\n""set_trace_func(proc{|t,|raise if t == 'return'})\n""m")
diff --git a/version.h b/version.h
index 1260cd5..75abe5c 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 360
+#define RUBY_PATCHLEVEL 361
#define RUBY_RELEASE_DATE "2012-12-25"
#define RUBY_RELEASE_YEAR 2012