Remove dependency on a working rake to run the tests

tenderlove · Jun 1, 2011 · 7382dc8 · 7382dc8
1 parent 107e801
commit 7382dc8
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 25 deletions.
diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb
@@ -777,12 +777,13 @@ def process_based_port
   ##
   # Allows the proper version of +rake+ to be used for the test.
 
-  def build_rake_in
+  def build_rake_in(good=true)
     gem_ruby = Gem.ruby
     Gem.ruby = @@ruby
     env_rake = ENV["rake"]
-    ENV["rake"] = @@rake
-    yield @@rake
+    rake = (good ? @@good_rake : @@bad_rake)
+    ENV["rake"] = rake
+    yield rake
   ensure
     Gem.ruby = gem_ruby
     if env_rake
@@ -822,15 +823,8 @@ def self.rubybin
   end
 
   @@ruby = rubybin
-  env_rake = ENV['rake']
-  ruby19_rake = File.expand_path("bin/rake", @@project_dir)
-  @@rake = if env_rake then
-             ENV["rake"]
-           elsif File.exist? ruby19_rake then
-             @@ruby + " " + ruby19_rake
-           else
-             'rake'
-           end
+  @@good_rake = "#{rubybin} #{File.expand_path('../../../test/rubygems/good_rake.rb', __FILE__)}"
+  @@bad_rake = "#{rubybin} #{File.expand_path('../../../test/rubygems/bad_rake.rb', __FILE__)}"
 
   ##
   # Construct a new Gem::Dependency.

diff --git a/test/rubygems/bad_rake.rb b/test/rubygems/bad_rake.rb
@@ -0,0 +1 @@
+exit 1
diff --git a/test/rubygems/good_rake.rb b/test/rubygems/good_rake.rb
@@ -0,0 +1 @@
+exit 0
diff --git a/test/rubygems/test_gem_ext_rake_builder.rb b/test/rubygems/test_gem_ext_rake_builder.rb
@@ -24,18 +24,18 @@ def test_class_build
     output = []
     realdir = nil # HACK /tmp vs. /private/tmp
 
-    build_rake_in do
+    build_rake_in do |rake|
       Dir.chdir @ext do
         realdir = Dir.pwd
         Gem::Ext::RakeBuilder.build 'mkrf_conf.rb', nil, @dest_path, output
       end
-    end
 
-    output = output.join "\n"
+      output = output.join "\n"
 
-    refute_match %r%^rake failed:%, output
-    assert_match %r%^#{Regexp.escape @@ruby} mkrf_conf\.rb%, output
-    assert_match %r%^#{Regexp.escape @@rake} RUBYARCHDIR=#{Regexp.escape @dest_path} RUBYLIBDIR=#{Regexp.escape @dest_path}%, output
+      refute_match %r%^rake failed:%, output
+      assert_match %r%^#{Regexp.escape @@ruby} mkrf_conf\.rb%, output
+      assert_match %r%^#{Regexp.escape rake} RUBYARCHDIR=#{Regexp.escape @dest_path} RUBYLIBDIR=#{Regexp.escape @dest_path}%, output
+    end
   end
 
   def test_class_build_fail
@@ -44,22 +44,22 @@ def test_class_build_fail
         File.open("Rakefile","w") do |f|
           f.puts "task :default do abort 'fail' end"
         end
-        EO_MKRF
+      EO_MKRF
     end
 
     output = []
 
-    error = assert_raises Gem::InstallError do
-      build_rake_in do
+    build_rake_in(false) do |rake|
+      error = assert_raises Gem::InstallError do
         Dir.chdir @ext do
           Gem::Ext::RakeBuilder.build "mkrf_conf.rb", nil, @dest_path, output
         end
       end
-    end
 
-    assert_match %r%^rake failed:%, error.message
-    assert_match %r%^#{Regexp.escape @@ruby} mkrf_conf\.rb%, error.message
-    assert_match %r%^#{Regexp.escape @@rake} RUBYARCHDIR=#{Regexp.escape @dest_path} RUBYLIBDIR=#{Regexp.escape @dest_path}%, error.message
+      assert_match %r%^rake failed:%, error.message
+      assert_match %r%^#{Regexp.escape @@ruby} mkrf_conf\.rb%, error.message
+      assert_match %r%^#{Regexp.escape rake} RUBYARCHDIR=#{Regexp.escape @dest_path} RUBYLIBDIR=#{Regexp.escape @dest_path}%, error.message
+    end
   end
 
 end