summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-13 16:05:37 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-13 16:05:37 +0000
commitfb2008a73a46066481b77f53c62de8630a153efe (patch)
tree1fa27793771e99416d853d8f647d329827cc514c
parent2e8f953d68275b3af4058a8335423b3d5c6d87a6 (diff)
* test/lib/envutil.rb: Moved from test/ruby/.
* test/lib/find_executable.rb: Ditto. * test/lib/memory_status.rb: Ditto. * test/lib/test/unit.rb: require envutil. * test/: Don't require envutil in test files. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48409 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog12
-rw-r--r--test/-ext-/bug_reporter/test_bug_reporter.rb1
-rw-r--r--test/-ext-/exception/test_data_error.rb1
-rw-r--r--test/-ext-/exception/test_ensured.rb1
-rw-r--r--test/-ext-/marshal/test_usrmarshal.rb1
-rw-r--r--test/-ext-/string/test_modify_expand.rb1
-rw-r--r--test/-ext-/struct/test_member.rb1
-rw-r--r--test/-ext-/test_bug-3571.rb1
-rw-r--r--test/-ext-/test_recursion.rb1
-rw-r--r--test/-ext-/tracepoint/test_tracepoint.rb1
-rw-r--r--test/-ext-/win32/test_dln.rb1
-rw-r--r--test/-ext-/win32/test_fd_setsize.rb1
-rw-r--r--test/bigdecimal/test_bigdecimal.rb1
-rw-r--r--test/bigdecimal/test_bigmath.rb1
-rw-r--r--test/cgi/test_cgi_multipart.rb1
-rw-r--r--test/drb/drbtest.rb1
-rw-r--r--test/dtrace/helper.rb1
-rw-r--r--test/fiddle/helper.rb1
-rw-r--r--test/fiddle/test_function.rb1
-rw-r--r--test/fiddle/test_handle.rb1
-rw-r--r--test/fiddle/test_pointer.rb1
-rw-r--r--test/fileutils/test_fileutils.rb1
-rw-r--r--test/gdbm/test_gdbm.rb1
-rw-r--r--test/io/console/test_io_console.rb1
-rw-r--r--test/irb/test_completion.rb1
-rw-r--r--test/irb/test_option.rb1
-rw-r--r--test/irb/test_raise_no_backtrace_exception.rb1
-rwxr-xr-xtest/json/test_json_generate.rb1
-rw-r--r--test/lib/envutil.rb (renamed from test/ruby/envutil.rb)3
-rw-r--r--test/lib/find_executable.rb (renamed from test/ruby/find_executable.rb)0
-rw-r--r--test/lib/memory_status.rb (renamed from test/ruby/memory_status.rb)2
-rw-r--r--test/lib/test/unit.rb1
-rw-r--r--test/logger/test_logdevice.rb1
-rw-r--r--test/mkmf/test_config.rb1
-rw-r--r--test/net/http/test_http.rb1
-rw-r--r--test/objspace/test_objspace.rb1
-rw-r--r--test/openssl/test_x509store.rb1
-rw-r--r--test/openssl/utils.rb1
-rw-r--r--test/pathname/test_pathname.rb1
-rw-r--r--test/rake/helper.rb1
-rw-r--r--test/readline/test_readline.rb1
-rw-r--r--test/rinda/test_rinda.rb1
-rw-r--r--test/ripper/test_files.rb3
-rw-r--r--test/ripper/test_parser_events.rb1
-rw-r--r--test/ruby/test_alias.rb1
-rw-r--r--test/ruby/test_argf.rb1
-rw-r--r--test/ruby/test_array.rb1
-rw-r--r--test/ruby/test_autoload.rb1
-rw-r--r--test/ruby/test_beginendblock.rb1
-rw-r--r--test/ruby/test_case.rb1
-rw-r--r--test/ruby/test_class.rb1
-rw-r--r--test/ruby/test_comparable.rb1
-rw-r--r--test/ruby/test_const.rb1
-rw-r--r--test/ruby/test_continuation.rb1
-rw-r--r--test/ruby/test_defined.rb1
-rw-r--r--test/ruby/test_dir_m17n.rb1
-rw-r--r--test/ruby/test_econv.rb1
-rw-r--r--test/ruby/test_encoding.rb1
-rw-r--r--test/ruby/test_enumerator.rb1
-rw-r--r--test/ruby/test_env.rb1
-rw-r--r--test/ruby/test_eval.rb1
-rw-r--r--test/ruby/test_exception.rb1
-rw-r--r--test/ruby/test_fiber.rb1
-rw-r--r--test/ruby/test_file.rb1
-rw-r--r--test/ruby/test_file_exhaustive.rb1
-rw-r--r--test/ruby/test_flip.rb1
-rw-r--r--test/ruby/test_float.rb1
-rw-r--r--test/ruby/test_fnmatch.rb1
-rw-r--r--test/ruby/test_gc.rb2
-rw-r--r--test/ruby/test_hash.rb1
-rw-r--r--test/ruby/test_io.rb1
-rw-r--r--test/ruby/test_io_m17n.rb1
-rw-r--r--test/ruby/test_iseq.rb1
-rw-r--r--test/ruby/test_keyword.rb1
-rw-r--r--test/ruby/test_lazy_enumerator.rb1
-rw-r--r--test/ruby/test_literal.rb1
-rw-r--r--test/ruby/test_m17n.rb1
-rw-r--r--test/ruby/test_method.rb1
-rw-r--r--test/ruby/test_module.rb1
-rw-r--r--test/ruby/test_numeric.rb1
-rw-r--r--test/ruby/test_object.rb1
-rw-r--r--test/ruby/test_objectspace.rb1
-rw-r--r--test/ruby/test_proc.rb1
-rw-r--r--test/ruby/test_process.rb1
-rw-r--r--test/ruby/test_rand.rb1
-rw-r--r--test/ruby/test_range.rb1
-rw-r--r--test/ruby/test_refinement.rb1
-rw-r--r--test/ruby/test_regexp.rb1
-rw-r--r--test/ruby/test_require.rb1
-rw-r--r--test/ruby/test_rubyoptions.rb2
-rw-r--r--test/ruby/test_settracefunc.rb1
-rw-r--r--test/ruby/test_signal.rb1
-rw-r--r--test/ruby/test_string.rb1
-rw-r--r--test/ruby/test_struct.rb1
-rw-r--r--test/ruby/test_super.rb1
-rw-r--r--test/ruby/test_syntax.rb3
-rw-r--r--test/ruby/test_system.rb1
-rw-r--r--test/ruby/test_thread.rb2
-rw-r--r--test/ruby/test_threadgroup.rb1
-rw-r--r--test/ruby/test_time.rb1
-rw-r--r--test/ruby/test_transcode.rb2
-rw-r--r--test/ruby/test_unicode_escape.rb1
-rw-r--r--test/ruby/test_variable.rb1
-rw-r--r--test/ruby/test_weakmap.rb1
-rw-r--r--test/ruby/test_whileuntil.rb1
-rw-r--r--test/runner.rb1
-rw-r--r--test/sdbm/test_sdbm.rb1
-rw-r--r--test/shell/test_command_processor.rb1
-rw-r--r--test/test_mathn.rb1
-rw-r--r--test/test_open3.rb1
-rw-r--r--test/test_pstore.rb1
-rw-r--r--test/test_pty.rb1
-rw-r--r--test/test_tempfile.rb1
-rw-r--r--test/test_time.rb1
-rw-r--r--test/test_tracer.rb1
-rw-r--r--test/test_weakref.rb1
-rw-r--r--test/testunit/test_rake_integration.rb1
-rw-r--r--test/thread/test_cv.rb1
-rw-r--r--test/thread/test_queue.rb1
-rw-r--r--test/uri/test_common.rb1
-rw-r--r--test/webrick/utils.rb1
121 files changed, 18 insertions, 124 deletions
diff --git a/ChangeLog b/ChangeLog
index 673fc91..7de6546 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Fri Nov 14 01:03:17 2014 Tanaka Akira <akr@fsij.org>
+
+ * test/lib/envutil.rb: Moved from test/ruby/.
+
+ * test/lib/find_executable.rb: Ditto.
+
+ * test/lib/memory_status.rb: Ditto.
+
+ * test/lib/test/unit.rb: require envutil.
+
+ * test/: Don't require envutil in test files.
+
Thu Nov 13 21:59:58 2014 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
* lib/rexml/document.rb: add REXML::Document#document.
diff --git a/test/-ext-/bug_reporter/test_bug_reporter.rb b/test/-ext-/bug_reporter/test_bug_reporter.rb
index f36f7a0..6ac5b8f 100644
--- a/test/-ext-/bug_reporter/test_bug_reporter.rb
+++ b/test/-ext-/bug_reporter/test_bug_reporter.rb
@@ -1,6 +1,5 @@
require 'test/unit'
require 'tmpdir'
-require_relative "../../ruby/envutil"
class TestBugReporter < Test::Unit::TestCase
def test_bug_reporter_add
diff --git a/test/-ext-/exception/test_data_error.rb b/test/-ext-/exception/test_data_error.rb
index 140de5b..53cbb28 100644
--- a/test/-ext-/exception/test_data_error.rb
+++ b/test/-ext-/exception/test_data_error.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative '../../ruby/envutil'
module Bug
class TestException < Test::Unit::TestCase
diff --git a/test/-ext-/exception/test_ensured.rb b/test/-ext-/exception/test_ensured.rb
index 103250c..97d9794 100644
--- a/test/-ext-/exception/test_ensured.rb
+++ b/test/-ext-/exception/test_ensured.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative '../../ruby/envutil'
module Bug
class Bug7802 < RuntimeError
diff --git a/test/-ext-/marshal/test_usrmarshal.rb b/test/-ext-/marshal/test_usrmarshal.rb
index ae23223..8d8db01 100644
--- a/test/-ext-/marshal/test_usrmarshal.rb
+++ b/test/-ext-/marshal/test_usrmarshal.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative '../../ruby/envutil'
require '-test-/marshal/usr'
module Bug end
diff --git a/test/-ext-/string/test_modify_expand.rb b/test/-ext-/string/test_modify_expand.rb
index 1d20db4..34b7be7 100644
--- a/test/-ext-/string/test_modify_expand.rb
+++ b/test/-ext-/string/test_modify_expand.rb
@@ -1,6 +1,5 @@
require 'test/unit'
require "-test-/string/string"
-require_relative '../../ruby/envutil'
class Test_StringModifyExpand < Test::Unit::TestCase
def test_modify_expand_memory_leak
diff --git a/test/-ext-/struct/test_member.rb b/test/-ext-/struct/test_member.rb
index 4e6295c..18e9808 100644
--- a/test/-ext-/struct/test_member.rb
+++ b/test/-ext-/struct/test_member.rb
@@ -1,6 +1,5 @@
require 'test/unit'
require "-test-/struct"
-require_relative '../../ruby/envutil'
class Bug::Struct::Test_Member < Test::Unit::TestCase
S = Bug::Struct.new(:a)
diff --git a/test/-ext-/test_bug-3571.rb b/test/-ext-/test_bug-3571.rb
index cd43d03..d7c26d1 100644
--- a/test/-ext-/test_bug-3571.rb
+++ b/test/-ext-/test_bug-3571.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative '../ruby/envutil'
class Test_BUG_3571 < Test::Unit::TestCase
def test_block_call_id
diff --git a/test/-ext-/test_recursion.rb b/test/-ext-/test_recursion.rb
index 43a256f..06faf6d 100644
--- a/test/-ext-/test_recursion.rb
+++ b/test/-ext-/test_recursion.rb
@@ -1,6 +1,5 @@
# -*- coding: us-ascii -*-
require 'test/unit'
-require_relative '../ruby/envutil'
class TestRecursion < Test::Unit::TestCase
require '-test-/recursion'
diff --git a/test/-ext-/tracepoint/test_tracepoint.rb b/test/-ext-/tracepoint/test_tracepoint.rb
index cc630e8..b5a6e76 100644
--- a/test/-ext-/tracepoint/test_tracepoint.rb
+++ b/test/-ext-/tracepoint/test_tracepoint.rb
@@ -1,6 +1,5 @@
require 'test/unit'
require '-test-/tracepoint'
-require_relative '../../ruby/envutil'
class TestTracepointObj < Test::Unit::TestCase
def test_not_available_from_ruby
diff --git a/test/-ext-/win32/test_dln.rb b/test/-ext-/win32/test_dln.rb
index c9065e6..2801ebe 100644
--- a/test/-ext-/win32/test_dln.rb
+++ b/test/-ext-/win32/test_dln.rb
@@ -1,7 +1,6 @@
require 'test/unit'
require 'tmpdir'
require 'rbconfig'
-require_relative '../../ruby/envutil'
module Bug
module Win32
diff --git a/test/-ext-/win32/test_fd_setsize.rb b/test/-ext-/win32/test_fd_setsize.rb
index 0881971..6fe889c 100644
--- a/test/-ext-/win32/test_fd_setsize.rb
+++ b/test/-ext-/win32/test_fd_setsize.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative '../../ruby/envutil'
module Bug
module Win32
diff --git a/test/bigdecimal/test_bigdecimal.rb b/test/bigdecimal/test_bigdecimal.rb
index 23c540b..042d11d 100644
--- a/test/bigdecimal/test_bigdecimal.rb
+++ b/test/bigdecimal/test_bigdecimal.rb
@@ -1,5 +1,4 @@
require_relative "testbase"
-require_relative "../ruby/envutil"
require 'bigdecimal/math'
require 'thread'
diff --git a/test/bigdecimal/test_bigmath.rb b/test/bigdecimal/test_bigmath.rb
index 88c2e2e..740c755 100644
--- a/test/bigdecimal/test_bigmath.rb
+++ b/test/bigdecimal/test_bigmath.rb
@@ -1,5 +1,4 @@
require_relative "testbase"
-require_relative "../ruby/envutil"
require "bigdecimal/math"
class TestBigMath < Test::Unit::TestCase
diff --git a/test/cgi/test_cgi_multipart.rb b/test/cgi/test_cgi_multipart.rb
index 806adbd..1325798 100644
--- a/test/cgi/test_cgi_multipart.rb
+++ b/test/cgi/test_cgi_multipart.rb
@@ -2,7 +2,6 @@ require 'test/unit'
require 'cgi'
require 'tempfile'
require 'stringio'
-require_relative '../ruby/envutil'
##
diff --git a/test/drb/drbtest.rb b/test/drb/drbtest.rb
index da44a96..aac705c 100644
--- a/test/drb/drbtest.rb
+++ b/test/drb/drbtest.rb
@@ -3,7 +3,6 @@ require 'drb/drb'
require 'drb/extservm'
require 'timeout'
require 'shellwords'
-require_relative '../ruby/envutil'
module DRbTests
diff --git a/test/dtrace/helper.rb b/test/dtrace/helper.rb
index 318857c..ccc7081 100644
--- a/test/dtrace/helper.rb
+++ b/test/dtrace/helper.rb
@@ -1,7 +1,6 @@
# -*- coding: us-ascii -*-
require 'test/unit'
require 'tempfile'
-require_relative '../ruby/envutil'
if Process.euid == 0
ok = true
diff --git a/test/fiddle/helper.rb b/test/fiddle/helper.rb
index f58077e..bc98f85 100644
--- a/test/fiddle/helper.rb
+++ b/test/fiddle/helper.rb
@@ -2,7 +2,6 @@ require 'minitest/autorun'
require 'fiddle'
# FIXME: this is stolen from DL and needs to be refactored.
-require_relative '../ruby/envutil'
libc_so = libm_so = nil
diff --git a/test/fiddle/test_function.rb b/test/fiddle/test_function.rb
index 63dfbd6..de7c958 100644
--- a/test/fiddle/test_function.rb
+++ b/test/fiddle/test_function.rb
@@ -1,6 +1,5 @@
begin
require_relative 'helper'
- require_relative '../ruby/envutil'
rescue LoadError
end
diff --git a/test/fiddle/test_handle.rb b/test/fiddle/test_handle.rb
index cde3fa8..ffbde41 100644
--- a/test/fiddle/test_handle.rb
+++ b/test/fiddle/test_handle.rb
@@ -1,6 +1,5 @@
begin
require_relative 'helper'
- require_relative '../ruby/envutil'
rescue LoadError
end
diff --git a/test/fiddle/test_pointer.rb b/test/fiddle/test_pointer.rb
index 2ba11b4..3ea9bc8 100644
--- a/test/fiddle/test_pointer.rb
+++ b/test/fiddle/test_pointer.rb
@@ -1,6 +1,5 @@
begin
require_relative 'helper'
- require_relative '../ruby/envutil'
rescue LoadError
end
diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb
index 5a9c1b1..fe9a1b3 100644
--- a/test/fileutils/test_fileutils.rb
+++ b/test/fileutils/test_fileutils.rb
@@ -6,7 +6,6 @@ require_relative 'fileasserts'
require 'pathname'
require 'tmpdir'
require 'test/unit'
-require_relative '../ruby/envutil'
class TestFileUtils < Test::Unit::TestCase
TMPROOT = "#{Dir.tmpdir}/fileutils.rb.#{$$}"
diff --git a/test/gdbm/test_gdbm.rb b/test/gdbm/test_gdbm.rb
index b707118..07a1bb3 100644
--- a/test/gdbm/test_gdbm.rb
+++ b/test/gdbm/test_gdbm.rb
@@ -7,7 +7,6 @@ if defined? GDBM
require 'test/unit'
require 'tmpdir'
require 'fileutils'
- require_relative '../ruby/envutil'
class TestGDBM_RDONLY < Test::Unit::TestCase
def TestGDBM_RDONLY.uname_s
diff --git a/test/io/console/test_io_console.rb b/test/io/console/test_io_console.rb
index 9cddd99..8b4fca5 100644
--- a/test/io/console/test_io_console.rb
+++ b/test/io/console/test_io_console.rb
@@ -4,7 +4,6 @@ begin
require 'pty'
rescue LoadError
end
-require_relative '../../ruby/envutil'
class TestIO_Console < Test::Unit::TestCase
Bug6116 = '[ruby-dev:45309]'
diff --git a/test/irb/test_completion.rb b/test/irb/test_completion.rb
index e8baa0d..eeeda12 100644
--- a/test/irb/test_completion.rb
+++ b/test/irb/test_completion.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative '../ruby/envutil'
module TestIRB
class TestCompletion < Test::Unit::TestCase
diff --git a/test/irb/test_option.rb b/test/irb/test_option.rb
index 5e29803..a7dd663 100644
--- a/test/irb/test_option.rb
+++ b/test/irb/test_option.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative '../ruby/envutil'
module TestIRB
class TestOption < Test::Unit::TestCase
diff --git a/test/irb/test_raise_no_backtrace_exception.rb b/test/irb/test_raise_no_backtrace_exception.rb
index e8204d7..67fb5b6 100644
--- a/test/irb/test_raise_no_backtrace_exception.rb
+++ b/test/irb/test_raise_no_backtrace_exception.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative '../ruby/envutil'
module TestIRB
class TestRaiseNoBacktraceException < Test::Unit::TestCase
diff --git a/test/json/test_json_generate.rb b/test/json/test_json_generate.rb
index 618b933..2d4e1ee 100755
--- a/test/json/test_json_generate.rb
+++ b/test/json/test_json_generate.rb
@@ -215,7 +215,6 @@ EOT
end
def test_gc
- require_relative '../ruby/envutil.rb'
assert_in_out_err(%w[-rjson --disable-gems], <<-EOS, [], [])
bignum_too_long_to_embed_as_string = 1234567890123456789012345
expect = bignum_too_long_to_embed_as_string.to_s
diff --git a/test/ruby/envutil.rb b/test/lib/envutil.rb
index 6b6d918..001753a 100644
--- a/test/ruby/envutil.rb
+++ b/test/lib/envutil.rb
@@ -1,7 +1,6 @@
# -*- coding: us-ascii -*-
require "open3"
require "timeout"
-require "test/unit"
require_relative "find_executable"
module EnvUtil
@@ -357,7 +356,7 @@ module Test
line -= 5 # lines until src
src = <<eom
# -*- coding: #{src.encoding}; -*-
- require #{__dir__.dump}'/envutil';include Test::Unit::Assertions
+ require #{__dir__.dump}'/test/unit';include Test::Unit::Assertions
END {
puts [Marshal.dump($!)].pack('m'), "assertions=\#{self._assertions}"
}
diff --git a/test/ruby/find_executable.rb b/test/lib/find_executable.rb
index 4ba9a05..4ba9a05 100644
--- a/test/ruby/find_executable.rb
+++ b/test/lib/find_executable.rb
diff --git a/test/ruby/memory_status.rb b/test/lib/memory_status.rb
index 6c6b3f8..071c5f6 100644
--- a/test/ruby/memory_status.rb
+++ b/test/lib/memory_status.rb
@@ -60,7 +60,7 @@ module Memory
end
else
PAT = /^\s*(\d+)\s+(\d+)$/
- require_relative 'find_executable'
+ require_relative '../lib/find_executable'
if PSCMD = EnvUtil.find_executable("ps", "-ovsz=", "-orss=", "-p", $$.to_s) {|out| PAT =~ out}
PSCMD.pop
end
diff --git a/test/lib/test/unit.rb b/test/lib/test/unit.rb
index c4fdf67..cfafbba 100644
--- a/test/lib/test/unit.rb
+++ b/test/lib/test/unit.rb
@@ -4,6 +4,7 @@ rescue Gem::LoadError
end
require 'minitest/unit'
require 'test/unit/assertions'
+require_relative '../envutil'
require 'test/unit/testcase'
require 'optparse'
diff --git a/test/logger/test_logdevice.rb b/test/logger/test_logdevice.rb
index 78eb12e..a563635 100644
--- a/test/logger/test_logdevice.rb
+++ b/test/logger/test_logdevice.rb
@@ -3,7 +3,6 @@ require 'test/unit'
require 'logger'
require 'tempfile'
require 'tmpdir'
-require_relative '../ruby/envutil'
class TestLogDevice < Test::Unit::TestCase
class LogExcnRaiser
diff --git a/test/mkmf/test_config.rb b/test/mkmf/test_config.rb
index 4a9be57..7bf537e 100644
--- a/test/mkmf/test_config.rb
+++ b/test/mkmf/test_config.rb
@@ -2,7 +2,6 @@ $extmk = true
require 'test/unit'
require 'mkmf'
-require_relative '../ruby/envutil'
class TestMkmf < Test::Unit::TestCase
class TestConfig < Test::Unit::TestCase
diff --git a/test/net/http/test_http.rb b/test/net/http/test_http.rb
index 90336b2..2cd883d 100644
--- a/test/net/http/test_http.rb
+++ b/test/net/http/test_http.rb
@@ -3,7 +3,6 @@ require 'test/unit'
require 'net/http'
require 'stringio'
require_relative 'utils'
-require_relative '../../ruby/envutil'
class TestNetHTTP < Test::Unit::TestCase
diff --git a/test/objspace/test_objspace.rb b/test/objspace/test_objspace.rb
index 8a5ed34..f507562 100644
--- a/test/objspace/test_objspace.rb
+++ b/test/objspace/test_objspace.rb
@@ -1,6 +1,5 @@
require "test/unit"
require "objspace"
-require_relative "../ruby/envutil"
class TestObjSpace < Test::Unit::TestCase
def test_memsize_of
diff --git a/test/openssl/test_x509store.rb b/test/openssl/test_x509store.rb
index 082e405..439c9de 100644
--- a/test/openssl/test_x509store.rb
+++ b/test/openssl/test_x509store.rb
@@ -1,4 +1,3 @@
-require_relative "../ruby/envutil"
require_relative "utils"
if defined?(OpenSSL)
diff --git a/test/openssl/utils.rb b/test/openssl/utils.rb
index 7d9f133..84cd48d 100644
--- a/test/openssl/utils.rb
+++ b/test/openssl/utils.rb
@@ -12,7 +12,6 @@ require "digest/md5"
require 'tempfile'
require "rbconfig"
require "socket"
-require_relative '../ruby/envutil'
module OpenSSL::TestUtils
TEST_KEY_RSA1024 = OpenSSL::PKey::RSA.new <<-_end_of_pem_
diff --git a/test/pathname/test_pathname.rb b/test/pathname/test_pathname.rb
index f77552c..046f3f0 100644
--- a/test/pathname/test_pathname.rb
+++ b/test/pathname/test_pathname.rb
@@ -5,7 +5,6 @@ require 'fileutils'
require 'tmpdir'
require 'enumerator'
-require_relative '../ruby/envutil'
class TestPathname < Test::Unit::TestCase
def self.define_assertion(name, linenum, &block)
diff --git a/test/rake/helper.rb b/test/rake/helper.rb
index 992c6bf..526eb30 100644
--- a/test/rake/helper.rb
+++ b/test/rake/helper.rb
@@ -13,7 +13,6 @@ require File.expand_path('../file_creation', __FILE__)
begin
- require_relative '../ruby/envutil'
require_relative 'support/ruby_runner'
require_relative 'support/rakefile_definitions'
rescue NoMethodError, LoadError
diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb
index ed71e00..3a5f972 100644
--- a/test/readline/test_readline.rb
+++ b/test/readline/test_readline.rb
@@ -509,7 +509,6 @@ class TestReadline < Test::Unit::TestCase
def assert_under_utf8
return false if ENV['LC_ALL'] == 'UTF-8'
loc = caller_locations(1, 1)[0].base_label.to_s
- require_relative "../ruby/envutil"
assert_separately([{"LC_ALL"=>"UTF-8"}, "-r", __FILE__], <<SRC)
#skip "test \#{ENV['LC_ALL']}"
#{self.class.name}.new(#{loc.dump}).run(Test::Unit::Runner.new)
diff --git a/test/rinda/test_rinda.rb b/test/rinda/test_rinda.rb
index 3f7dc96..812b437 100644
--- a/test/rinda/test_rinda.rb
+++ b/test/rinda/test_rinda.rb
@@ -488,7 +488,6 @@ class TupleSpaceProxyTest < Test::Unit::TestCase
end
def test_take_bug_8215
- require_relative '../ruby/envutil'
service = DRb.start_service(nil, @ts_base)
uri = service.uri
diff --git a/test/ripper/test_files.rb b/test/ripper/test_files.rb
index a003593..ca26e35 100644
--- a/test/ripper/test_files.rb
+++ b/test/ripper/test_files.rb
@@ -1,11 +1,10 @@
require 'test/unit'
-require_relative '../ruby/envutil'
module TestRipper; end
class TestRipper::Generic < Test::Unit::TestCase
def test_parse_files
srcdir = File.expand_path("../../..", __FILE__)
- assert_separately(%W[--disable-gem -rripper -r#{__dir__}/../ruby/envutil - #{srcdir}],
+ assert_separately(%W[--disable-gem -rripper - #{srcdir}],
__FILE__, __LINE__, <<-'eom', timeout: Float::INFINITY)
TEST_RATIO = 0.05 # testing all files needs too long time...
class Parser < Ripper
diff --git a/test/ripper/test_parser_events.rb b/test/ripper/test_parser_events.rb
index ed02678..cab91b9 100644
--- a/test/ripper/test_parser_events.rb
+++ b/test/ripper/test_parser_events.rb
@@ -1,6 +1,5 @@
begin
require_relative 'dummyparser'
- require_relative '../ruby/envutil'
require 'test/unit'
ripper_test = true
module TestRipper; end
diff --git a/test/ruby/test_alias.rb b/test/ruby/test_alias.rb
index dec61f6..8901fc2 100644
--- a/test/ruby/test_alias.rb
+++ b/test/ruby/test_alias.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative 'envutil'
class TestAlias < Test::Unit::TestCase
class Alias0
diff --git a/test/ruby/test_argf.rb b/test/ruby/test_argf.rb
index 95d6941..6975b83 100644
--- a/test/ruby/test_argf.rb
+++ b/test/ruby/test_argf.rb
@@ -3,7 +3,6 @@ require 'timeout'
require 'tmpdir'
require 'tempfile'
require 'fileutils'
-require_relative 'envutil'
class TestArgf < Test::Unit::TestCase
def setup
diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb
index d728bb7..4116736 100644
--- a/test/ruby/test_array.rb
+++ b/test/ruby/test_array.rb
@@ -1,6 +1,5 @@
# coding: US-ASCII
require 'test/unit'
-require_relative 'envutil'
class TestArray < Test::Unit::TestCase
def setup
diff --git a/test/ruby/test_autoload.rb b/test/ruby/test_autoload.rb
index 0dbf613..b2b969a 100644
--- a/test/ruby/test_autoload.rb
+++ b/test/ruby/test_autoload.rb
@@ -1,7 +1,6 @@
require 'test/unit'
require 'tempfile'
require 'thread'
-require_relative 'envutil'
class TestAutoload < Test::Unit::TestCase
def test_autoload_so
diff --git a/test/ruby/test_beginendblock.rb b/test/ruby/test_beginendblock.rb
index d15f210..9c9d6b5 100644
--- a/test/ruby/test_beginendblock.rb
+++ b/test/ruby/test_beginendblock.rb
@@ -1,7 +1,6 @@
require 'test/unit'
require 'tempfile'
require 'timeout'
-require_relative 'envutil'
class TestBeginEndBlock < Test::Unit::TestCase
DIR = File.dirname(File.expand_path(__FILE__))
diff --git a/test/ruby/test_case.rb b/test/ruby/test_case.rb
index f17f9aa..f20d1df 100644
--- a/test/ruby/test_case.rb
+++ b/test/ruby/test_case.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative 'envutil.rb'
class TestCase < Test::Unit::TestCase
def test_case
diff --git a/test/ruby/test_class.rb b/test/ruby/test_class.rb
index 293524b..e17f56f 100644
--- a/test/ruby/test_class.rb
+++ b/test/ruby/test_class.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative 'envutil'
class TestClass < Test::Unit::TestCase
# ------------------
diff --git a/test/ruby/test_comparable.rb b/test/ruby/test_comparable.rb
index 1912472..efa630f 100644
--- a/test/ruby/test_comparable.rb
+++ b/test/ruby/test_comparable.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative 'envutil'
class TestComparable < Test::Unit::TestCase
def setup
diff --git a/test/ruby/test_const.rb b/test/ruby/test_const.rb
index c4a4d93..8b3acfb 100644
--- a/test/ruby/test_const.rb
+++ b/test/ruby/test_const.rb
@@ -1,6 +1,5 @@
# -*- coding: us-ascii -*-
require 'test/unit'
-require_relative 'envutil'
class TestConst < Test::Unit::TestCase
TEST1 = 1
diff --git a/test/ruby/test_continuation.rb b/test/ruby/test_continuation.rb
index 52d8de4..8112518 100644
--- a/test/ruby/test_continuation.rb
+++ b/test/ruby/test_continuation.rb
@@ -1,7 +1,6 @@
require 'test/unit'
require 'continuation'
require 'fiber'
-require_relative 'envutil'
class TestContinuation < Test::Unit::TestCase
def test_create
diff --git a/test/ruby/test_defined.rb b/test/ruby/test_defined.rb
index 657f793..d5e8418 100644
--- a/test/ruby/test_defined.rb
+++ b/test/ruby/test_defined.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative 'envutil'
class TestDefined < Test::Unit::TestCase
class Foo
diff --git a/test/ruby/test_dir_m17n.rb b/test/ruby/test_dir_m17n.rb
index 091c12c..0547f2e 100644
--- a/test/ruby/test_dir_m17n.rb
+++ b/test/ruby/test_dir_m17n.rb
@@ -1,6 +1,5 @@
require 'test/unit'
require 'tmpdir'
-require_relative 'envutil'
class TestDir_M17N < Test::Unit::TestCase
def with_tmpdir
diff --git a/test/ruby/test_econv.rb b/test/ruby/test_econv.rb
index 6bfd6ba..f423ebf 100644
--- a/test/ruby/test_econv.rb
+++ b/test/ruby/test_econv.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative 'envutil'
class TestEncodingConverter < Test::Unit::TestCase
def check_ec(edst, esrc, eres, dst, src, ec, off, len, opts=nil)
diff --git a/test/ruby/test_encoding.rb b/test/ruby/test_encoding.rb
index e3b15eb..63c56e2 100644
--- a/test/ruby/test_encoding.rb
+++ b/test/ruby/test_encoding.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative 'envutil'
class TestEncoding < Test::Unit::TestCase
diff --git a/test/ruby/test_enumerator.rb b/test/ruby/test_enumerator.rb
index f2a7afa..b5ced3b 100644
--- a/test/ruby/test_enumerator.rb
+++ b/test/ruby/test_enumerator.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative 'envutil'
class TestEnumerator < Test::Unit::TestCase
def setup
diff --git a/test/ruby/test_env.rb b/test/ruby/test_env.rb
index 52cc487..88a7631 100644
--- a/test/ruby/test_env.rb
+++ b/test/ruby/test_env.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative 'envutil'
class TestEnv < Test::Unit::TestCase
IGNORE_CASE = /bccwin|mswin|mingw/ =~ RUBY_PLATFORM
diff --git a/test/ruby/test_eval.rb b/test/ruby/test_eval.rb
index 315cc72..1ad186f 100644
--- a/test/ruby/test_eval.rb
+++ b/test/ruby/test_eval.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative 'envutil'
class TestEval < Test::Unit::TestCase
diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb
index bb291c0..4659def 100644
--- a/test/ruby/test_exception.rb
+++ b/test/ruby/test_exception.rb
@@ -1,6 +1,5 @@
require 'test/unit'
require 'tempfile'
-require_relative 'envutil'
class TestException < Test::Unit::TestCase
def test_exception_rescued
diff --git a/test/ruby/test_fiber.rb b/test/ruby/test_fiber.rb
index ed071ac..4acfb13 100644
--- a/test/ruby/test_fiber.rb
+++ b/test/ruby/test_fiber.rb
@@ -2,7 +2,6 @@ require 'test/unit'
require 'fiber'
require 'continuation'
require 'tmpdir'
-require_relative './envutil'
class TestFiber < Test::Unit::TestCase
def test_normal
diff --git a/test/ruby/test_file.rb b/test/ruby/test_file.rb
index 974752c..0825c5d 100644
--- a/test/ruby/test_file.rb
+++ b/test/ruby/test_file.rb
@@ -1,7 +1,6 @@
require 'test/unit'
require 'tempfile'
require "thread"
-require_relative 'envutil'
require_relative 'ut_eof'
class TestFile < Test::Unit::TestCase
diff --git a/test/ruby/test_file_exhaustive.rb b/test/ruby/test_file_exhaustive.rb
index bd69add..59ed117 100644
--- a/test/ruby/test_file_exhaustive.rb
+++ b/test/ruby/test_file_exhaustive.rb
@@ -1,7 +1,6 @@
require "test/unit"
require "fileutils"
require "tmpdir"
-require_relative "envutil"
class TestFileExhaustive < Test::Unit::TestCase
DRIVE = Dir.pwd[%r'\A(?:[a-z]:|//[^/]+/[^/]+)'i]
diff --git a/test/ruby/test_flip.rb b/test/ruby/test_flip.rb
index fc62d93..84f7bf0 100644
--- a/test/ruby/test_flip.rb
+++ b/test/ruby/test_flip.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative 'envutil'
class TestFlip < Test::Unit::TestCase
def test_hidden_key
diff --git a/test/ruby/test_float.rb b/test/ruby/test_float.rb
index 30725e8..ac2d843 100644
--- a/test/ruby/test_float.rb
+++ b/test/ruby/test_float.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative 'envutil'
class TestFloat < Test::Unit::TestCase
include EnvUtil
diff --git a/test/ruby/test_fnmatch.rb b/test/ruby/test_fnmatch.rb
index 15e5d79..a0eab54 100644
--- a/test/ruby/test_fnmatch.rb
+++ b/test/ruby/test_fnmatch.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative 'envutil'
class TestFnmatch < Test::Unit::TestCase
diff --git a/test/ruby/test_gc.rb b/test/ruby/test_gc.rb
index 6d1f93c..9baf429 100644
--- a/test/ruby/test_gc.rb
+++ b/test/ruby/test_gc.rb
@@ -1,7 +1,5 @@
require 'test/unit'
-require_relative "envutil"
-
class TestGc < Test::Unit::TestCase
class S
def initialize(a)
diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb
index 4431552..da07df9 100644
--- a/test/ruby/test_hash.rb
+++ b/test/ruby/test_hash.rb
@@ -1,7 +1,6 @@
# -*- coding: us-ascii -*-
require 'test/unit'
require 'continuation'
-require_relative 'envutil'
class TestHash < Test::Unit::TestCase
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index af77da2..2d8072a 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -8,7 +8,6 @@ require 'stringio'
require 'timeout'
require 'tempfile'
require 'weakref'
-require_relative 'envutil'
class TestIO < Test::Unit::TestCase
module Feature
diff --git a/test/ruby/test_io_m17n.rb b/test/ruby/test_io_m17n.rb
index de64a78..97512f0 100644
--- a/test/ruby/test_io_m17n.rb
+++ b/test/ruby/test_io_m17n.rb
@@ -2,7 +2,6 @@
require 'test/unit'
require 'tmpdir'
require 'timeout'
-require_relative 'envutil'
class TestIO_M17N < Test::Unit::TestCase
ENCS = [
diff --git a/test/ruby/test_iseq.rb b/test/ruby/test_iseq.rb
index 94a814c..79c41bb 100644
--- a/test/ruby/test_iseq.rb
+++ b/test/ruby/test_iseq.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative 'envutil'
class TestISeq < Test::Unit::TestCase
ISeq = RubyVM::InstructionSequence
diff --git a/test/ruby/test_keyword.rb b/test/ruby/test_keyword.rb
index 95cbcc2..d71108f 100644
--- a/test/ruby/test_keyword.rb
+++ b/test/ruby/test_keyword.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative 'envutil'
class TestKeywordArguments < Test::Unit::TestCase
def f1(str: "foo", num: 424242)
diff --git a/test/ruby/test_lazy_enumerator.rb b/test/ruby/test_lazy_enumerator.rb
index 7bf9903..75f2458 100644
--- a/test/ruby/test_lazy_enumerator.rb
+++ b/test/ruby/test_lazy_enumerator.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative 'envutil'
class TestLazyEnumerator < Test::Unit::TestCase
class Step
diff --git a/test/ruby/test_literal.rb b/test/ruby/test_literal.rb
index e4c35e0..036be5f 100644
--- a/test/ruby/test_literal.rb
+++ b/test/ruby/test_literal.rb
@@ -1,6 +1,5 @@
# -*- coding: us-ascii -*-
require 'test/unit'
-require_relative 'envutil'
class TestRubyLiteral < Test::Unit::TestCase
diff --git a/test/ruby/test_m17n.rb b/test/ruby/test_m17n.rb
index 6537b07..bbaf31f 100644
--- a/test/ruby/test_m17n.rb
+++ b/test/ruby/test_m17n.rb
@@ -1,6 +1,5 @@
# coding: US-ASCII
require 'test/unit'
-require_relative 'envutil'
class TestM17N < Test::Unit::TestCase
def assert_encoding(encname, actual, message=nil)
diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb
index 97cc430..9fc2ab1 100644
--- a/test/ruby/test_method.rb
+++ b/test/ruby/test_method.rb
@@ -1,6 +1,5 @@
# -*- coding: us-ascii -*-
require 'test/unit'
-require_relative 'envutil'
class TestMethod < Test::Unit::TestCase
def setup
diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb
index 324d45f..5b1f787 100644
--- a/test/ruby/test_module.rb
+++ b/test/ruby/test_module.rb
@@ -1,6 +1,5 @@
require 'test/unit'
require 'pp'
-require_relative 'envutil'
$m0 = Module.nesting
diff --git a/test/ruby/test_numeric.rb b/test/ruby/test_numeric.rb
index b42509d..e818d52 100644
--- a/test/ruby/test_numeric.rb
+++ b/test/ruby/test_numeric.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative 'envutil'
class TestNumeric < Test::Unit::TestCase
class DummyNumeric < Numeric
diff --git a/test/ruby/test_object.rb b/test/ruby/test_object.rb
index a0f245a..0fe9471 100644
--- a/test/ruby/test_object.rb
+++ b/test/ruby/test_object.rb
@@ -1,6 +1,5 @@
# -*- coding: us-ascii -*-
require 'test/unit'
-require_relative 'envutil'
class TestObject < Test::Unit::TestCase
def setup
diff --git a/test/ruby/test_objectspace.rb b/test/ruby/test_objectspace.rb
index de7c6be..4b8ae74 100644
--- a/test/ruby/test_objectspace.rb
+++ b/test/ruby/test_objectspace.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative 'envutil'
class TestObjectSpace < Test::Unit::TestCase
def self.deftest_id2ref(obj)
diff --git a/test/ruby/test_proc.rb b/test/ruby/test_proc.rb
index 17778df..f760cce 100644
--- a/test/ruby/test_proc.rb
+++ b/test/ruby/test_proc.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative 'envutil'
class TestProc < Test::Unit::TestCase
def setup
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
index 5d252e1..15a83a3 100644
--- a/test/ruby/test_process.rb
+++ b/test/ruby/test_process.rb
@@ -2,7 +2,6 @@ require 'test/unit'
require 'tempfile'
require 'timeout'
require 'io/wait'
-require_relative 'envutil'
require 'rbconfig'
class TestProcess < Test::Unit::TestCase
diff --git a/test/ruby/test_rand.rb b/test/ruby/test_rand.rb
index 62efecb..d2a1244 100644
--- a/test/ruby/test_rand.rb
+++ b/test/ruby/test_rand.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative 'envutil'
class TestRand < Test::Unit::TestCase
def assert_random_int(ws, m, init = 0)
diff --git a/test/ruby/test_range.rb b/test/ruby/test_range.rb
index e3880bf..f81047d 100644
--- a/test/ruby/test_range.rb
+++ b/test/ruby/test_range.rb
@@ -2,7 +2,6 @@ require 'test/unit'
require 'delegate'
require 'timeout'
require 'bigdecimal'
-require_relative 'envutil'
class TestRange < Test::Unit::TestCase
def test_range_string
diff --git a/test/ruby/test_refinement.rb b/test/ruby/test_refinement.rb
index 5a60a6a..11077b6 100644
--- a/test/ruby/test_refinement.rb
+++ b/test/ruby/test_refinement.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative 'envutil'
# to supress warnings for future calls of Module#refine
EnvUtil.suppress_warning do
diff --git a/test/ruby/test_regexp.rb b/test/ruby/test_regexp.rb
index 1ef5bb2..e16075a 100644
--- a/test/ruby/test_regexp.rb
+++ b/test/ruby/test_regexp.rb
@@ -1,6 +1,5 @@
# coding: US-ASCII
require 'test/unit'
-require_relative 'envutil'
class TestRegexp < Test::Unit::TestCase
def setup
diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb
index 971140a..3b7f6a7 100644
--- a/test/ruby/test_require.rb
+++ b/test/ruby/test_require.rb
@@ -1,7 +1,6 @@
require 'test/unit'
require 'tempfile'
-require_relative 'envutil'
require 'tmpdir'
class TestRequire < Test::Unit::TestCase
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index ac7cc7b..31fe9ae 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -4,8 +4,6 @@ require 'test/unit'
require 'tmpdir'
require 'tempfile'
-require_relative 'envutil'
-
class TestRubyOptions < Test::Unit::TestCase
def write_file(filename, content)
File.open(filename, "w") {|f|
diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb
index b13eea0..44a9ede 100644
--- a/test/ruby/test_settracefunc.rb
+++ b/test/ruby/test_settracefunc.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative 'envutil'
class TestSetTraceFunc < Test::Unit::TestCase
def setup
diff --git a/test/ruby/test_signal.rb b/test/ruby/test_signal.rb
index e74a2c4..4a59aa6 100644
--- a/test/ruby/test_signal.rb
+++ b/test/ruby/test_signal.rb
@@ -1,7 +1,6 @@
require 'test/unit'
require 'timeout'
require 'tempfile'
-require_relative 'envutil'
class TestSignal < Test::Unit::TestCase
def test_signal
diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb
index 543c138..c0fd83e 100644
--- a/test/ruby/test_string.rb
+++ b/test/ruby/test_string.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative 'envutil'
# use of $= is deprecated after 1.7.1
def pre_1_7_1
diff --git a/test/ruby/test_struct.rb b/test/ruby/test_struct.rb
index 37366c3..71d93fb 100644
--- a/test/ruby/test_struct.rb
+++ b/test/ruby/test_struct.rb
@@ -1,7 +1,6 @@
# -*- coding: us-ascii -*-
require 'test/unit'
require 'timeout'
-require_relative 'envutil'
module TestStruct
def test_struct
diff --git a/test/ruby/test_super.rb b/test/ruby/test_super.rb
index e4d3b8d..7d4048b 100644
--- a/test/ruby/test_super.rb
+++ b/test/ruby/test_super.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative 'envutil'
class TestSuper < Test::Unit::TestCase
class Base
diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb
index e704705..00e2160 100644
--- a/test/ruby/test_syntax.rb
+++ b/test/ruby/test_syntax.rb
@@ -1,11 +1,10 @@
require 'test/unit'
-require_relative 'envutil'
class TestSyntax < Test::Unit::TestCase
def assert_syntax_files(test)
srcdir = File.expand_path("../../..", __FILE__)
srcdir = File.join(srcdir, test)
- assert_separately(%W[--disable-gem -r#{__dir__}/envutil - #{srcdir}],
+ assert_separately(%W[--disable-gem - #{srcdir}],
__FILE__, __LINE__, <<-'eom', timeout: Float::INFINITY)
dir = ARGV.shift
for script in Dir["#{dir}/**/*.rb"].sort
diff --git a/test/ruby/test_system.rb b/test/ruby/test_system.rb
index 9e43695..b328cbc 100644
--- a/test/ruby/test_system.rb
+++ b/test/ruby/test_system.rb
@@ -1,6 +1,5 @@
require 'test/unit'
require 'tmpdir'
-require_relative 'envutil'
class TestSystem < Test::Unit::TestCase
def test_system
diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb
index 65636d9..fba4737 100644
--- a/test/ruby/test_thread.rb
+++ b/test/ruby/test_thread.rb
@@ -1,7 +1,6 @@
# -*- coding: us-ascii -*-
require 'test/unit'
require 'thread'
-require_relative 'envutil'
class TestThread < Test::Unit::TestCase
class Thread < ::Thread
@@ -124,7 +123,6 @@ class TestThread < Test::Unit::TestCase
dir = File.dirname(__FILE__)
lbtest = File.join(dir, "lbtest.rb")
$:.unshift File.join(File.dirname(dir), 'ruby')
- require 'envutil'
$:.shift
3.times {
`#{EnvUtil.rubybin} #{lbtest}`
diff --git a/test/ruby/test_threadgroup.rb b/test/ruby/test_threadgroup.rb
index f4c03de..e158f5a 100644
--- a/test/ruby/test_threadgroup.rb
+++ b/test/ruby/test_threadgroup.rb
@@ -1,6 +1,5 @@
require 'test/unit'
require 'thread'
-require_relative 'envutil'
class TestThreadGroup < Test::Unit::TestCase
def test_thread_init
diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb
index a57cd5d..cfbf42d 100644
--- a/test/ruby/test_time.rb
+++ b/test/ruby/test_time.rb
@@ -2,7 +2,6 @@ require 'test/unit'
require 'delegate'
require 'timeout'
require 'delegate'
-require_relative 'envutil'
class TestTime < Test::Unit::TestCase
def setup
diff --git a/test/ruby/test_transcode.rb b/test/ruby/test_transcode.rb
index 5f3f51a..0306dc3 100644
--- a/test/ruby/test_transcode.rb
+++ b/test/ruby/test_transcode.rb
@@ -2,7 +2,7 @@
# some of the comments are in UTF-8
require 'test/unit'
-require_relative 'envutil'
+
class TestTranscode < Test::Unit::TestCase
def test_errors
assert_raise(Encoding::ConverterNotFoundError) { 'abc'.encode('foo', 'bar') }
diff --git a/test/ruby/test_unicode_escape.rb b/test/ruby/test_unicode_escape.rb
index 2561b49..9d0d787 100644
--- a/test/ruby/test_unicode_escape.rb
+++ b/test/ruby/test_unicode_escape.rb
@@ -1,7 +1,6 @@
# -*- coding: utf-8 -*-
require 'test/unit'
-require_relative 'envutil'
class TestUnicodeEscape < Test::Unit::TestCase
def test_basic
diff --git a/test/ruby/test_variable.rb b/test/ruby/test_variable.rb
index 308839d..8dc5c2f 100644
--- a/test/ruby/test_variable.rb
+++ b/test/ruby/test_variable.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative 'envutil'
class TestVariable < Test::Unit::TestCase
class Gods
diff --git a/test/ruby/test_weakmap.rb b/test/ruby/test_weakmap.rb
index 94590a0..1279944 100644
--- a/test/ruby/test_weakmap.rb
+++ b/test/ruby/test_weakmap.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative 'envutil'
class TestWeakMap < Test::Unit::TestCase
def setup
diff --git a/test/ruby/test_whileuntil.rb b/test/ruby/test_whileuntil.rb
index ca853af..3d8dbee 100644
--- a/test/ruby/test_whileuntil.rb
+++ b/test/ruby/test_whileuntil.rb
@@ -1,6 +1,5 @@
require 'test/unit'
require 'tmpdir'
-require_relative 'envutil'
class TestWhileuntil < Test::Unit::TestCase
def test_while
diff --git a/test/runner.rb b/test/runner.rb
index 0e6ee3b..11db537 100644
--- a/test/runner.rb
+++ b/test/runner.rb
@@ -5,7 +5,6 @@ $LOAD_PATH << src_testdir
$LOAD_PATH.unshift "#{src_testdir}/lib"
require 'test/unit'
-require_relative 'ruby/envutil'
module Gem
end
diff --git a/test/sdbm/test_sdbm.rb b/test/sdbm/test_sdbm.rb
index 7a42e78..f415584 100644
--- a/test/sdbm/test_sdbm.rb
+++ b/test/sdbm/test_sdbm.rb
@@ -1,6 +1,5 @@
require 'test/unit'
require 'tmpdir'
-require_relative '../ruby/envutil'
begin
require 'sdbm'
diff --git a/test/shell/test_command_processor.rb b/test/shell/test_command_processor.rb
index 2d3f8a4..66e4244 100644
--- a/test/shell/test_command_processor.rb
+++ b/test/shell/test_command_processor.rb
@@ -1,6 +1,5 @@
require 'shell'
require 'tmpdir'
-require_relative '../ruby/envutil'
class TestShell < Test::Unit::TestCase
end
diff --git a/test/test_mathn.rb b/test/test_mathn.rb
index bbb8851..8a482f3 100644
--- a/test/test_mathn.rb
+++ b/test/test_mathn.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative 'ruby/envutil'
# mathn redefines too much. It must be isolated to child processes.
class TestMathn < Test::Unit::TestCase
diff --git a/test/test_open3.rb b/test/test_open3.rb
index cd63034..46a991d 100644
--- a/test/test_open3.rb
+++ b/test/test_open3.rb
@@ -1,6 +1,5 @@
require 'test/unit'
require 'open3'
-require_relative 'ruby/envutil'
class TestOpen3 < Test::Unit::TestCase
RUBY = EnvUtil.rubybin
diff --git a/test/test_pstore.rb b/test/test_pstore.rb
index 522f2d1..e028ed6 100644
--- a/test/test_pstore.rb
+++ b/test/test_pstore.rb
@@ -1,7 +1,6 @@
require 'test/unit'
require 'pstore'
require 'tmpdir'
-require_relative 'ruby/envutil'
class PStoreTest < Test::Unit::TestCase
def setup
diff --git a/test/test_pty.rb b/test/test_pty.rb
index 7639f6a..0ec4f96 100644
--- a/test/test_pty.rb
+++ b/test/test_pty.rb
@@ -1,5 +1,4 @@
require 'test/unit'
-require_relative 'ruby/envutil'
require 'shellwords'
require 'tmpdir'
diff --git a/test/test_tempfile.rb b/test/test_tempfile.rb
index eb61120..2fe62d3 100644
--- a/test/test_tempfile.rb
+++ b/test/test_tempfile.rb
@@ -1,7 +1,6 @@
require 'test/unit'
require 'tempfile'
require 'thread'
-require_relative 'ruby/envutil'
class TestTempfile < Test::Unit::TestCase
def initialize(*)
diff --git a/test/test_time.rb b/test/test_time.rb
index dff559f..f39713b 100644
--- a/test/test_time.rb
+++ b/test/test_time.rb
@@ -1,6 +1,5 @@
require 'time'
require 'test/unit'
-require_relative 'ruby/envutil.rb'
class TestTimeExtension < Test::Unit::TestCase # :nodoc:
def test_rfc822
diff --git a/test/test_tracer.rb b/test/test_tracer.rb
index c833695..ff3ba87 100644
--- a/test/test_tracer.rb
+++ b/test/test_tracer.rb
@@ -1,6 +1,5 @@
require 'test/unit'
require 'tmpdir'
-require_relative 'ruby/envutil'
class TestTracer < Test::Unit::TestCase
include EnvUtil
diff --git a/test/test_weakref.rb b/test/test_weakref.rb
index f12e943..129c1e6 100644
--- a/test/test_weakref.rb
+++ b/test/test_weakref.rb
@@ -1,6 +1,5 @@
require 'test/unit'
require 'weakref'
-require_relative './ruby/envutil'
class TestWeakRef < Test::Unit::TestCase
def make_weakref(level = 10)
diff --git a/test/testunit/test_rake_integration.rb b/test/testunit/test_rake_integration.rb
index 0770404..0d0f8ef 100644
--- a/test/testunit/test_rake_integration.rb
+++ b/test/testunit/test_rake_integration.rb
@@ -1,6 +1,5 @@
require 'minitest/autorun'
require 'tmpdir'
-require_relative '../ruby/envutil'
class RakeIntegration < MiniTest::Unit::TestCase
include Test::Unit::Assertions
diff --git a/test/thread/test_cv.rb b/test/thread/test_cv.rb
index db6067e..b399b47 100644
--- a/test/thread/test_cv.rb
+++ b/test/thread/test_cv.rb
@@ -1,7 +1,6 @@
require 'test/unit'
require 'thread'
require 'tmpdir'
-require_relative '../ruby/envutil'
class TestConditionVariable < Test::Unit::TestCase
def test_initialized
diff --git a/test/thread/test_queue.rb b/test/thread/test_queue.rb
index 4f495cc..2bd71db 100644
--- a/test/thread/test_queue.rb
+++ b/test/thread/test_queue.rb
@@ -2,7 +2,6 @@ require 'test/unit'
require 'thread'
require 'tmpdir'
require 'timeout'
-require_relative '../ruby/envutil'
class TestQueue < Test::Unit::TestCase
def test_queue_initialized
diff --git a/test/uri/test_common.rb b/test/uri/test_common.rb
index 24a5325..5620415 100644
--- a/test/uri/test_common.rb
+++ b/test/uri/test_common.rb
@@ -1,6 +1,5 @@
require 'test/unit'
require 'uri'
-require_relative '../ruby/envutil'
module URI
diff --git a/test/webrick/utils.rb b/test/webrick/utils.rb
index 0e94ad3..71559a5 100644
--- a/test/webrick/utils.rb
+++ b/test/webrick/utils.rb
@@ -1,4 +1,3 @@
-require_relative '../ruby/envutil'
require "webrick"
begin
require "webrick/https"