merges r24016 from trunk into ruby_1_9_1.

--
Add test for marshaling regexp.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24080 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 8 insertions, 1 deletions

diff --git a/test/ruby/marshaltestlib.rb b/test/ruby/marshaltestlib.rb
index 4486a7842..f16910cd7 100644
--- a/test/ruby/marshaltestlib.rb
+++ b/test/ruby/marshaltestlib.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
 module MarshalTestLib
   # include this module to a Test::Unit::TestCase and definde encode(o) and
   # decode(s) methods.  e.g.
@@ -245,6 +246,12 @@ module MarshalTestLib
     marshal_equal(/a/)
     marshal_equal(/A/i)
     marshal_equal(/A/mx)
+    marshal_equal(/a\u3042/)
+    marshal_equal(/aあ/)
+    assert_equal(Regexp.new("あ".force_encoding("ASCII-8BIT")),
+                 Marshal.load("\004\b/\b\343\201\202\000"))
+    assert_equal(/au3042/, Marshal.load("\004\b/\fa\\u3042\000"))
+    #assert_equal(/au3042/u, Marshal.load("\004\b/\fa\\u3042@")) # spec
   end
 
   def test_regexp_subclass
diff --git a/version.h b/version.h
index 5a73ec9fd..c13052991 100644
--- a/version.h
+++ b/version.h
@@ -4,7 +4,7 @@
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
-#define RUBY_PATCHLEVEL 229
+#define RUBY_PATCHLEVEL 230
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 7
 #define RUBY_RELEASE_DAY 12