diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-25 10:37:01 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-25 10:37:01 +0000 |
| commit | 6cd13d6577401706d3f008e2f80ec14339988018 (patch) | |
| tree | 71013778de4496cac2c36d6c43a154c85d10e424 /test | |
| parent | 1833cfab3522d8e2e1028adc49564be75c133ef2 (diff) | |
Fix broken merge of gemutilities, add build_rake_in as necessary
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19549 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/rubygems/gemutilities.rb | 4 | ||||
| -rw-r--r-- | test/rubygems/test_gem_commands_uninstall_command.rb | 6 | ||||
| -rw-r--r-- | test/rubygems/test_gem_installer.rb | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/test/rubygems/gemutilities.rb b/test/rubygems/gemutilities.rb index d1e50676d5..8083875f43 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 dfe84dc348..80f6591aef 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 4dc31efd1b..8ce9ed9ce6 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)) |