diff --git a/ChangeLog b/ChangeLog index 5ffca2b7d8ecf2..ec21109c6f431e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ +Tue Jun 3 12:26:47 2014 Koichi Sasada <ko1@atdot.net> + + * test/ruby/memory_status.rb: add $LOAD_PATH to load test/unit + correctly for fiddle/import unavailable environments. + Tue Jun 3 09:45:13 2014 NAKAMURA Usaku <usa@ruby-lang.org> - * test/openssl/test_ssl.rb (OpenSSL::TestSSL#test_verify_result): +o * test/openssl/test_ssl.rb (OpenSSL::TestSSL#test_verify_result): shouldn't use same server for respective tests, because the 1st test sometimes kills the server main loop silently. [Bug #9881] [ruby-dev:48266] diff --git a/test/ruby/memory_status.rb b/test/ruby/memory_status.rb index 6a014fdf242216..f8e097a9cdac82 100644 --- a/test/ruby/memory_status.rb +++ b/test/ruby/memory_status.rb @@ -18,6 +18,7 @@ def self.read_status begin require 'fiddle/import' rescue LoadError + $LOAD_PATH.unshift File.join(File.join(__dir__, '..'), 'lib') require_relative 'envutil' EnvUtil.suppress_warning do require 'dl/import'