From 7ad690313b3b274b2c527ab26d341f69fb09dbd5 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 3 Jun 2011 13:07:57 +0000
Subject: * lib/rubygems/test_case.rb: Refix for test-all in separate
 directory.   r31147 + r31151.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31914 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rubygems/test_case.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/rubygems/test_case.rb')

diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb
index 3b26d31611..7923fac7ed 100644
--- a/lib/rubygems/test_case.rb
+++ b/lib/rubygems/test_case.rb
@@ -103,7 +103,7 @@ class Gem::TestCase < MiniTest::Unit::TestCase
   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 @@ class Gem::TestCase < MiniTest::Unit::TestCase
     @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 @@ class Gem::TestCase < MiniTest::Unit::TestCase
       Gem::RemoteFetcher.fetcher = nil
     end
 
-    Dir.chdir @@project_dir
+    Dir.chdir @current_dir
 
     FileUtils.rm_rf @tempdir unless ENV['KEEP_FILES']
 
-- 
cgit v1.2.3