Skip to content

Commit

Permalink
* test/ruby/memory_status.rb: add $LOAD_PATH to load test/unit
Browse files Browse the repository at this point in the history
  correctly for fiddle/import unavailable environments.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46326 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
ko1 committed Jun 3, 2014
1 parent 5d9eae4 commit d27a685
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
7 changes: 6 additions & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Tue Jun 3 12:26:47 2014 Koichi Sasada <[email protected]>

* 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 <[email protected]>

* 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]
Expand Down
1 change: 1 addition & 0 deletions test/ruby/memory_status.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

0 comments on commit d27a685

Please sign in to comment.