diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | test/ruby/test_require.rb | 4 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Tue Nov 6 05:48:06 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com> + + * 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@scottishclmibs.com> * thread_pthread.c (rb_reserved_fd_p): fix typo in macro check diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb index dbbe483578..36d7c788bf 100644 --- a/test/ruby/test_require.rb +++ b/test/ruby/test_require.rb @@ -501,7 +501,7 @@ class TestRequire < Test::Unit::TestCase 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 @@ class TestRequire < Test::Unit::TestCase 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" |