[前][次][番号順一覧][スレッド一覧]

ruby-changes:34245

From: ko1 <ko1@a...>
Date: Tue, 3 Jun 2014 12:29:18 +0900 (JST)
Subject: [ruby-changes:34245] ko1:r46326 (trunk): * test/ruby/memory_status.rb: add $LOAD_PATH to load test/unit

ko1	2014-06-03 12:29:12 +0900 (Tue, 03 Jun 2014)

  New Revision: 46326

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=46326

  Log:
    * test/ruby/memory_status.rb: add $LOAD_PATH to load test/unit
      correctly for fiddle/import unavailable environments.

  Modified files:
    trunk/ChangeLog
    trunk/test/ruby/memory_status.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 46325)
+++ ChangeLog	(revision 46326)
@@ -1,6 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Tue Jun  3 12:26:47 2014  Koichi Sasada  <ko1@a...>
+
+	* 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@r...>
 
-	* 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]
Index: test/ruby/memory_status.rb
===================================================================
--- test/ruby/memory_status.rb	(revision 46325)
+++ test/ruby/memory_status.rb	(revision 46326)
@@ -18,6 +18,7 @@ module Memory https://github.com/ruby/ruby/blob/trunk/test/ruby/memory_status.rb#L18
     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'

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]