@@ -19,6 +19,7 @@ def stat
1919 end
2020
2121 def setup
22+ @top_dir = File . expand_path ( '../../lib' , __dir__ )
2223 @tempfile = Tempfile . new ( "logger" )
2324 @tempfile . close
2425 @filename = @tempfile . path
@@ -456,7 +457,7 @@ def test_shifting_size_not_rotate_too_much
456457
457458 def test_shifting_midnight
458459 Dir . mktmpdir do |tmpdir |
459- assert_in_out_err ( [ *%W" --disable=gems -rlogger -C#{ tmpdir } - " ] , "#{ <<-"begin;" } \n #{ <<-'end;' } " )
460+ assert_in_out_err ( [ *%W" --disable=gems -I #{ @top_dir } - rlogger -C#{ tmpdir } - " ] , "#{ <<-"begin;" } \n #{ <<-'end;' } " )
460461 begin;
461462 begin
462463 module FakeTime
@@ -498,7 +499,7 @@ class << Time
498499
499500 def test_shifting_weekly
500501 Dir . mktmpdir do |tmpdir |
501- assert_in_out_err ( [ { "TZ" => "UTC" } , *%W" -rlogger -C#{ tmpdir } - " ] , "#{ <<-"begin;" } \n #{ <<-'end;' } " )
502+ assert_in_out_err ( [ { "TZ" => "UTC" } , *%W" -I #{ @top_dir } - rlogger -C#{ tmpdir } - " ] , "#{ <<-"begin;" } \n #{ <<-'end;' } " )
502503 begin;
503504 begin
504505 module FakeTime
@@ -543,7 +544,7 @@ class << Time
543544
544545 def test_shifting_monthly
545546 Dir . mktmpdir do |tmpdir |
546- assert_in_out_err ( [ { "TZ" => "UTC" } , *%W" -rlogger -C#{ tmpdir } - " ] , "#{ <<-"begin;" } \n #{ <<-'end;' } " )
547+ assert_in_out_err ( [ { "TZ" => "UTC" } , *%W" -I #{ @top_dir } - rlogger -C#{ tmpdir } - " ] , "#{ <<-"begin;" } \n #{ <<-'end;' } " )
547548 begin;
548549 begin
549550 module FakeTime
@@ -588,7 +589,7 @@ class << Time
588589
589590 def test_shifting_dst_change
590591 Dir . mktmpdir do |tmpdir |
591- assert_in_out_err ( [ { "TZ" => "Europe/London" } , *%W" --disable=gems -rlogger -C#{ tmpdir } - " ] , "#{ <<-"begin;" } \n #{ <<-'end;' } " )
592+ assert_in_out_err ( [ { "TZ" => "Europe/London" } , *%W" --disable=gems -I #{ @top_dir } - rlogger -C#{ tmpdir } - " ] , "#{ <<-"begin;" } \n #{ <<-'end;' } " )
592593 begin;
593594 begin
594595 module FakeTime
@@ -627,7 +628,7 @@ class << Time
627628
628629 def test_shifting_weekly_dst_change
629630 Dir . mktmpdir do |tmpdir |
630- assert_separately ( [ { "TZ" => "Europe/London" } , *%W" -rlogger -C#{ tmpdir } - " ] , "#{ <<-"begin;" } \n #{ <<-'end;' } " )
631+ assert_separately ( [ { "TZ" => "Europe/London" } , *%W" -I #{ @top_dir } - rlogger -C#{ tmpdir } - " ] , "#{ <<-"begin;" } \n #{ <<-'end;' } " )
631632 begin;
632633 begin
633634 module FakeTime
@@ -658,7 +659,7 @@ class << Time
658659
659660 def test_shifting_monthly_dst_change
660661 Dir . mktmpdir do |tmpdir |
661- assert_separately ( [ { "TZ" => "Europe/London" } , *%W" -rlogger -C#{ tmpdir } - " ] , "#{ <<-"begin;" } \n #{ <<-'end;' } " )
662+ assert_separately ( [ { "TZ" => "Europe/London" } , *%W" -I #{ @top_dir } - rlogger -C#{ tmpdir } - " ] , "#{ <<-"begin;" } \n #{ <<-'end;' } " )
662663 begin;
663664 begin
664665 module FakeTime
@@ -707,7 +708,7 @@ class << Time
707708
708709 def test_shifting_midnight_exist_file
709710 Dir . mktmpdir do |tmpdir |
710- assert_in_out_err ( [ *%W" --disable=gems -rlogger -C#{ tmpdir } - " ] , "#{ <<-"begin;" } \n #{ <<-'end;' } " )
711+ assert_in_out_err ( [ *%W" --disable=gems -I #{ @top_dir } - rlogger -C#{ tmpdir } - " ] , "#{ <<-"begin;" } \n #{ <<-'end;' } " )
711712 begin;
712713 begin
713714 module FakeTime
@@ -751,7 +752,7 @@ class << Time
751752
752753 def test_shifting_weekly_exist_file
753754 Dir . mktmpdir do |tmpdir |
754- assert_in_out_err ( [ { "TZ" => "UTC" } , *%W" -rlogger -C#{ tmpdir } - " ] , "#{ <<-"begin;" } \n #{ <<-'end;' } " )
755+ assert_in_out_err ( [ { "TZ" => "UTC" } , *%W" -I #{ @top_dir } - rlogger -C#{ tmpdir } - " ] , "#{ <<-"begin;" } \n #{ <<-'end;' } " )
755756 begin;
756757 begin
757758 module FakeTime
@@ -798,7 +799,7 @@ class << Time
798799
799800 def test_shifting_monthly_exist_file
800801 Dir . mktmpdir do |tmpdir |
801- assert_in_out_err ( [ { "TZ" => "UTC" } , *%W" -rlogger -C#{ tmpdir } - " ] , "#{ <<-"begin;" } \n #{ <<-'end;' } " )
802+ assert_in_out_err ( [ { "TZ" => "UTC" } , *%W" -I #{ @top_dir } - rlogger -C#{ tmpdir } - " ] , "#{ <<-"begin;" } \n #{ <<-'end;' } " )
802803 begin;
803804 begin
804805 module FakeTime
@@ -848,7 +849,8 @@ class << Time
848849 def run_children ( n , args , src )
849850 r , w = IO . pipe
850851 [ w , *( 1 ..n ) . map do
851- f = IO . popen ( [ EnvUtil . rubybin , *%w[ --disable=gems -rlogger - ] , *args ] , "w" , err : w )
852+ f = IO . popen ( [ EnvUtil . rubybin , *%w[ --disable=gems - ] , *args ] , "w" , err : w )
853+ src = "$LOAD_PATH.unshift('#{ @top_dir } '); require 'logger';#{ src } "
852854 f . puts ( src )
853855 f
854856 end ] . each ( &:close )
0 commit comments