diff --git a/ChangeLog b/ChangeLog index 673fc91ae1..7de654666e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Fri Nov 14 01:03:17 2014 Tanaka Akira + + * 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 * 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 f36f7a08ff..6ac5b8f995 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 140de5bd5a..53cbb28438 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 103250c678..97d9794186 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 ae23223e15..8d8db012ac 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 1d20db4e6c..34b7be7bba 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 4e6295c218..18e98085a0 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 cd43d0330d..d7c26d1ff0 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 43a256f942..06faf6dc7a 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 cc630e895b..b5a6e769d6 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 c9065e66fb..2801ebe3c9 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 0881971969..6fe889c941 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 23c540b338..042d11da0f 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 88c2e2e120..740c755eae 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 806adbd013..1325798e95 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 da44a96baa..aac705c831 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 318857c8dd..ccc708147d 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 f58077e7bc..bc98f858ba 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 63dfbd6e5d..de7c9585f7 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 cde3fa816d..ffbde41626 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 2ba11b4ed7..3ea9bc86dd 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 5a9c1b1243..fe9a1b327d 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 b707118162..07a1bb3386 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 9cddd991a6..8b4fca5064 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 e8baa0d8f5..eeeda1234c 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 5e29803bb6..a7dd663112 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 e8204d7a1b..67fb5b66cc 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 618b933bac..2d4e1eea52 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 similarity index 99% rename from test/ruby/envutil.rb rename to test/lib/envutil.rb index 6b6d91833f..001753a9f0 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 = <"UTF-8"}, "-r", __FILE__], <