merge revision(s) 37201,37202:

	* test/ruby/test_regexp.rb
	  (TextRegexp#test_raw_hyphen_and_tk_char_type_after_range): ignoring
	  warnings are already set in setup method.

	* test/ruby/test_regexp.rb
	  (TextRegexp#test_raw_hyphen_and_tk_char_type_after_range): use
	  Regexp.new instead of literal to ignore a parser warning.


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

3 files changed, 17 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 8e651760a4..f6ca9e3187 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Tue Oct 16 09:47:47 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_regexp.rb
+	  (TextRegexp#test_raw_hyphen_and_tk_char_type_after_range): use
+	  Regexp.new instead of literal to ignore a parser warning.
+
+Tue Oct 16 09:47:47 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_regexp.rb
+	  (TextRegexp#test_raw_hyphen_and_tk_char_type_after_range): ignoring
+	  warnings are already set in setup method.
+
 Sun Oct 14 01:21:42 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* regparse.c (parse_char_class): should match with a hyphen after a
diff --git a/test/ruby/test_regexp.rb b/test/ruby/test_regexp.rb
index 30adfefe1e..3073a98b89 100644
--- a/test/ruby/test_regexp.rb
+++ b/test/ruby/test_regexp.rb
@@ -870,11 +870,7 @@ class TestRegexp < Test::Unit::TestCase
 
   def test_raw_hyphen_and_tk_char_type_after_range
     bug6853 = '[ruby-core:47115]'
-    begin
-      verbose, $VERBOSE = $VERBOSE, nil
-      check(/[0-1-\s]/, [' ', '-'], [], bug6853)
-    ensure
-      $VERBOSE = verbose
-    end
+    # use Regexp.new instead of literal to ignore a parser warning.
+    check(Regexp.new('[0-1-\\s]'), [' ', '-'], ['2', 'a'], bug6853)
   end
 end
diff --git a/version.h b/version.h
index 8b5332fd94..3f6df3e58a 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 289
+#define RUBY_PATCHLEVEL 290
 
-#define RUBY_RELEASE_DATE "2012-10-14"
+#define RUBY_RELEASE_DATE "2012-10-16"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 14
+#define RUBY_RELEASE_DAY 16
 
 #include "ruby/version.h"