Restore support library for only test files that are digest and csv.

3 files changed, 24 insertions, 2 deletions

diff --git a/test/csv/helper.rb b/test/csv/helper.rb
index 208ee62441..eadff54408 100644
--- a/test/csv/helper.rb
+++ b/test/csv/helper.rb
@@ -3,7 +3,7 @@ require "test/unit"
 
 require "csv"
 
-require_relative "../../tool/lib/with_different_ofs.rb"
+require_relative "../lib/with_different_ofs"
 
 module Helper
   def with_chunk_size(chunk_size)
diff --git a/test/digest/test_digest_extend.rb b/test/digest/test_digest_extend.rb
index a07e2c044a..bd599f2d20 100644
--- a/test/digest/test_digest_extend.rb
+++ b/test/digest/test_digest_extend.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 require 'test/unit'
 require 'digest'
-require_relative '../../tool/lib/with_different_ofs.rb'
+require_relative '../lib/with_different_ofs'
 
 class TestDigestExtend < Test::Unit::TestCase
   extend DifferentOFS
diff --git a/test/lib/with_different_ofs.rb b/test/lib/with_different_ofs.rb
new file mode 100644
index 0000000000..559ed6a1d1
--- /dev/null
+++ b/test/lib/with_different_ofs.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+module DifferentOFS
+  module WithDifferentOFS
+    def setup
+      super
+      verbose, $VERBOSE = $VERBOSE, nil
+      @ofs, $, = $,, "-"
+      $VERBOSE = verbose
+    end
+    def teardown
+      verbose, $VERBOSE = $VERBOSE, nil
+      $, = @ofs
+      $VERBOSE = verbose
+      super
+    end
+  end
+
+  def self.extended(klass)
+    super(klass)
+    klass.const_set(:DifferentOFS, Class.new(klass).class_eval {include WithDifferentOFS}).name
+  end
+end