summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/rubygems/gemutilities.rb3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index bac981b917..5f10c1e53e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 17 18:07:17 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/rubygems/gemutilities.rb (RubyGemTestCase#build_rake_in):
+ get rid of interference with other tests.
+
Fri Oct 17 11:48:18 2008 Shugo Maeda <shugo@ruby-lang.org>
* ext/socket/socket.c (init_sock): sockets should be binmode.
diff --git a/test/rubygems/gemutilities.rb b/test/rubygems/gemutilities.rb
index f118f89a7b..fd4db68a26 100644
--- a/test/rubygems/gemutilities.rb
+++ b/test/rubygems/gemutilities.rb
@@ -430,6 +430,8 @@ class RubyGemTestCase < Test::Unit::TestCase
Gem.module_eval {@ruby = ruby}
env_rake = ENV["rake"]
ENV["rake"] = @@rake
+ argv = ARGV.dup
+ ARGV.clear
yield @@rake
ensure
Gem.module_eval {@ruby = gem_ruby}
@@ -438,6 +440,7 @@ class RubyGemTestCase < Test::Unit::TestCase
else
ENV.delete("rake")
end
+ ARGV.replace(argv) if argv
end
def self.rubybin