Fix broken merge of gemutilities, add build_rake_in as necessary

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19549 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 10 insertions, 6 deletions

diff --git a/test/rubygems/gemutilities.rb b/test/rubygems/gemutilities.rb
index d1e50676d..8083875f4 100644
--- a/test/rubygems/gemutilities.rb
+++ b/test/rubygems/gemutilities.rb
@@ -461,11 +461,11 @@ class RubyGemTestCase < Test::Unit::TestCase
 
   @@ruby = rubybin
   env_rake = ENV['rake']
-  ruby19_rake = @@ruby + " " + File.expand_path("../../../bin/rake", __FILE__)
+  ruby19_rake = File.expand_path("../../../bin/rake", __FILE__)
   @@rake = if env_rake then
              ENV["rake"]
            elsif File.exist? ruby19_rake then
-             ruby19_rake
+             @@ruby + " " + ruby19_rake
            else
              'rake'
            end
diff --git a/test/rubygems/test_gem_commands_uninstall_command.rb b/test/rubygems/test_gem_commands_uninstall_command.rb
index dfe84dc34..80f6591ae 100644
--- a/test/rubygems/test_gem_commands_uninstall_command.rb
+++ b/test/rubygems/test_gem_commands_uninstall_command.rb
@@ -12,8 +12,10 @@ class TestGemCommandsUninstallCommand < GemInstallerTestCase
     ui = MockGemUi.new
     util_setup_gem ui
 
-    use_ui ui do
-      @installer.install
+    build_rake_in do
+      use_ui ui do
+        @installer.install
+      end
     end
 
     @cmd = Gem::Commands::UninstallCommand.new
diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb
index 4dc31efd1..8ce9ed9ce 100644
--- a/test/rubygems/test_gem_installer.rb
+++ b/test/rubygems/test_gem_installer.rb
@@ -618,8 +618,10 @@ load 'my_exec'
     @installer = Gem::Installer.new @gem, :install_dir => gemhome2,
                                     :source_index => source_index
 
-    use_ui @ui do
-      @installer.install
+    build_rake_in do
+      use_ui @ui do
+        @installer.install
+      end
     end
 
     assert File.exist?(File.join(gemhome2, 'gems', @spec.full_name))