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

ruby-changes:19108

From: naruse <ko1@a...>
Date: Tue, 22 Mar 2011 10:59:26 +0900 (JST)
Subject: [ruby-changes:19108] Ruby:r31147 (trunk): * test/runner.rb: set Gem::TestCase's @@project_dir.

naruse	2011-03-22 10:59:18 +0900 (Tue, 22 Mar 2011)

  New Revision: 31147

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

  Log:
    * test/runner.rb: set Gem::TestCase's @@project_dir.
    
    * lib/rubygems/test_case.rb: set Gem::TestCase's @@project_dir only
      when it is not defined.

  Modified files:
    trunk/ChangeLog
    trunk/lib/rubygems/test_case.rb
    trunk/test/runner.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 31146)
+++ ChangeLog	(revision 31147)
@@ -1,3 +1,10 @@
+Tue Mar 22 10:57:36 2011  NARUSE, Yui  <naruse@r...>
+
+	* test/runner.rb: set Gem::TestCase's @@project_dir.
+
+	* lib/rubygems/test_case.rb: set Gem::TestCase's @@project_dir only
+	  when it is not defined.
+
 Tue Mar 22 09:38:19 2011  NARUSE, Yui  <naruse@r...>
 
 	* numeric.c (flo_round): use pow instead of while-loop. fixes #4510
Index: lib/rubygems/test_case.rb
===================================================================
--- lib/rubygems/test_case.rb	(revision 31146)
+++ lib/rubygems/test_case.rb	(revision 31147)
@@ -87,7 +87,7 @@
   undef_method :default_test if instance_methods.include? 'default_test' or
                                 instance_methods.include? :default_test
 
-  @@project_dir = Dir.pwd
+  @@project_dir = Dir.pwd unless defined?(@@project_dir)
 
   ##
   # #setup prepares a sandboxed location to install gems.  All installs are
Index: test/runner.rb
===================================================================
--- test/runner.rb	(revision 31146)
+++ test/runner.rb	(revision 31147)
@@ -4,6 +4,9 @@
 
 src_testdir = File.dirname(File.expand_path(__FILE__))
 $LOAD_PATH << src_testdir
+class Gem::TestCase < MiniTest::Unit::TestCase
+  @@project_dir = File.dirname($LOAD_PATH.last)
+end
 
 require_relative 'profile_test_all' if ENV['RUBY_TEST_ALL_PROFILE'] == 'true'
 

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

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