summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--test/webrick/utils.rb1
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 63d024581a..606079cdc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jan 20 11:39:41 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * test/webrick/utils.rb (TestWEBrick::RubyBin): test CGI does not need
+ to load rubygems. if it activated, ruby raises LoadError about
+ rbconfig.rb.
+
Thu Jan 20 09:19:42 2011 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/visitors/json_tree.rb: Fix JSON emit for
diff --git a/test/webrick/utils.rb b/test/webrick/utils.rb
index ebc936cb2c..ef4654cafd 100644
--- a/test/webrick/utils.rb
+++ b/test/webrick/utils.rb
@@ -14,6 +14,7 @@ module TestWEBrick
end
RubyBin = "\"#{EnvUtil.rubybin}\""
+ RubyBin << " --disable-gems"
RubyBin << " \"-I#{File.expand_path("../..", File.dirname(__FILE__))}/lib\""
RubyBin << " \"-I#{File.dirname(EnvUtil.rubybin)}/.ext/common\""
RubyBin << " \"-I#{File.dirname(EnvUtil.rubybin)}/.ext/#{RUBY_PLATFORM}\""