naruse	2013-01-09 13:56:34 +0900 (Wed, 09 Jan 2013)

  New Revision: 38746

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

  Log:
    Add RUBYOPT=>nil to avoid false negative
    
    add RUBYOPT=nil to suppress circular require warnings to avoid false negative
    with stderr assertion.

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

Index: test/ruby/test_require.rb
===================================================================
--- test/ruby/test_require.rb	(revision 38745)
+++ test/ruby/test_require.rb	(revision 38746)
@@ -609,13 +609,11 @@ class TestRequire < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_require.rb#L609
     bug7530 = '[ruby-core:50645]'
     script = Tempfile.new(%w'bug-7530- .rb')
     script.close
-    dir, base = File.split(script.path)
-    assert_in_out_err(["-C", dir, "-", base], <<-INPUT, %w(:ok), [], bug7530)
+    assert_in_out_err([{"RUBYOPT" => nil}, "-", script.path], <<-INPUT, %w(:ok), [], bug7530)
       PATH = ARGV.shift
       THREADS = 2
       ITERATIONS_PER_THREAD = 1000
 
-      $: << '.'
       THREADS.times.map {
         Thread.new do
           ITERATIONS_PER_THREAD.times do

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