naruse	2011-06-03 22:07:57 +0900 (Fri, 03 Jun 2011)

  New Revision: 31914

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

  Log:
    * lib/rubygems/test_case.rb: Refix for test-all in separate directory.
      r31147 + r31151.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 31913)
+++ ChangeLog	(revision 31914)
@@ -1,3 +1,8 @@
+Fri Jun  3 21:48:12 2011  NARUSE, Yui  <naruse@r...>
+
+	* lib/rubygems/test_case.rb: Refix for test-all in separate directory.
+	  r31147 + r31151.
+
 Fri Jun  3 20:58:47 2011  NAKAMURA Usaku  <usa@r...>
 
 	* ext/date/date_core.c (d_lite_plus): get rid of compiler warnings.
Index: lib/rubygems/test_case.rb
===================================================================
--- lib/rubygems/test_case.rb	(revision 31913)
+++ lib/rubygems/test_case.rb	(revision 31914)
@@ -103,7 +103,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
@@ -122,6 +122,7 @@
     @orig_gem_home = ENV['GEM_HOME']
     @orig_gem_path = ENV['GEM_PATH']
 
+    @current_dir = Dir.pwd
     @ui = Gem::MockGemUi.new
 
     tmpdir = nil
@@ -228,7 +229,7 @@
       Gem::RemoteFetcher.fetcher = nil
     end
 
-    Dir.chdir @@project_dir
+    Dir.chdir @current_dir
 
     FileUtils.rm_rf @tempdir unless ENV['KEEP_FILES']
 

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