shirosaki	2012-11-06 05:55:30 +0900 (Tue, 06 Nov 2012)

  New Revision: 37484

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

  Log:
    * test/ruby/test_require.rb
      (TestRequire#test_require_to_path_redefined_in_load_path,
       TestRequire#test_require_to_str_redefined_in_load_path):
      Suppress method redefined warning when test-all with RUBYOPT=-w.

  Modified files:
    trunk/ChangeLog
    trunk/test/ruby/test_require.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37483)
+++ ChangeLog	(revision 37484)
@@ -1,3 +1,10 @@
+Tue Nov  6 05:48:06 2012  Hiroshi Shirosaki  <h.shirosaki@g...>
+
+	* test/ruby/test_require.rb
+	  (TestRequire#test_require_to_path_redefined_in_load_path,
+	   TestRequire#test_require_to_str_redefined_in_load_path):
+	  Suppress method redefined warning when test-all with RUBYOPT=-w.
+
 Mon Nov  5 11:40:00 2012  Mark Somerville  <mark@s...>
 
 	* thread_pthread.c (rb_reserved_fd_p): fix typo in macro check
Index: test/ruby/test_require.rb
===================================================================
--- test/ruby/test_require.rb	(revision 37483)
+++ test/ruby/test_require.rb	(revision 37484)
@@ -501,7 +501,7 @@
     Dir.mktmpdir {|tmp|
       Dir.chdir(tmp) {
         open("foo.rb", "w") {}
-        assert_in_out_err([], <<-INPUT, %w(:ok), [], bug7158)
+        assert_in_out_err(["RUBYOPT"=>nil], <<-INPUT, %w(:ok), [], bug7158)
           a = Object.new
           def a.to_path
             "bar"
@@ -526,7 +526,7 @@
     Dir.mktmpdir {|tmp|
       Dir.chdir(tmp) {
         open("foo.rb", "w") {}
-        assert_in_out_err([], <<-INPUT, %w(:ok), [], bug7158)
+        assert_in_out_err(["RUBYOPT"=>nil], <<-INPUT, %w(:ok), [], bug7158)
           a = Object.new
           def a.to_str
             "foo"

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