Import rubygems 1.5.0 (release candidate)

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30599 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 7 insertions, 16 deletions

diff --git a/test/rubygems/test_gem_ext_rake_builder.rb b/test/rubygems/test_gem_ext_rake_builder.rb
index 243852b86f..d2e7de4cda 100644
--- a/test/rubygems/test_gem_ext_rake_builder.rb
+++ b/test/rubygems/test_gem_ext_rake_builder.rb
@@ -1,4 +1,10 @@
-require_relative 'gemutilities'
+######################################################################
+# This file is imported from the rubygems project.
+# DO NOT make modifications in this repo. They _will_ be reverted!
+# File a patch instead and assign it to Ryan Davis or Eric Hodel.
+######################################################################
+
+require "test/rubygems/gemutilities"
 require 'rubygems/ext'
 
 class TestGemExtRakeBuilder < RubyGemTestCase
@@ -33,13 +39,6 @@ class TestGemExtRakeBuilder < RubyGemTestCase
 
     output = output.join "\n"
 
-    expected = [
-      "#{@@ruby} mkrf_conf.rb",
-      "",
-      "#{@@rake} RUBYARCHDIR=#{@dest_path} RUBYLIBDIR=#{@dest_path}",
-      "(in #{realdir})\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
@@ -64,14 +63,6 @@ class TestGemExtRakeBuilder < RubyGemTestCase
       end
     end
 
-    expected = <<-EOF.strip
-rake failed:
-
-#{@@ruby} mkrf_conf.rb
-
-#{@@rake} RUBYARCHDIR=#{@dest_path} RUBYLIBDIR=#{@dest_path}
-    EOF
-
     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