summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bootstraptest/test_exception.rb14
-rw-r--r--version.h2
2 files changed, 14 insertions, 2 deletions
diff --git a/bootstraptest/test_exception.rb b/bootstraptest/test_exception.rb
index bd3d02ade3..33154a546d 100644
--- a/bootstraptest/test_exception.rb
+++ b/bootstraptest/test_exception.rb
@@ -370,7 +370,7 @@ assert_equal %q{}, %q{
}
##
-assert_match /undefined method `foo\'/, %q{
+assert_match /undefined method `foo\'/, %q{#`
STDERR.reopen(STDOUT)
class C
def inspect
@@ -402,3 +402,15 @@ assert_equal 'nil', %q{
exc.inspect
}, '[ruby-dev:32608]'
+assert_equal 'exception class/object expected', %q{
+ class ZeroDivisionError
+ def self.new(message)
+ 42
+ end
+ end
+ begin
+ 1/0
+ rescue Exception => e
+ e.message
+ end
+}, '[ruby-core:24767]'
diff --git a/version.h b/version.h
index 1fdfd6999e..e2395aedf1 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 272
+#define RUBY_PATCHLEVEL 273
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1