yugui	2011-05-12 06:23:43 +0900 (Thu, 12 May 2011)

  New Revision: 31515

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31515

  Log:
    merges r30842 from trunk into ruby_1_9_2.
    --
    * test/ruby/test_m17n_comb.rb (TestM17NComb#test_str_scan):
      assert_raise does not check exception message.

  Modified files:
    branches/ruby_1_9_2/test/ruby/test_m17n_comb.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 31514)
+++ ruby_1_9_2/version.h	(revision 31515)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 199
+#define RUBY_PATCHLEVEL 200
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
Index: ruby_1_9_2/test/ruby/test_m17n_comb.rb
===================================================================
--- ruby_1_9_2/test/ruby/test_m17n_comb.rb	(revision 31514)
+++ ruby_1_9_2/test/ruby/test_m17n_comb.rb	(revision 31515)
@@ -1098,7 +1098,7 @@
         if s1.valid_encoding?
           assert_raise(Encoding::CompatibilityError) { s1.scan(s2) }
         else
-          assert_raise(ArgumentError, /invalid byte sequence/) { s1.scan(s2) }
+          assert_match(/invalid byte sequence/, assert_raise(ArgumentError) { s1.scan(s2) }.message)
         end
         next
       end

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