nobu	2011-07-09 08:39:42 +0900 (Sat, 09 Jul 2011)

  New Revision: 32464

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32464

  Log:
    * common.mk (RUN_OPT): disable gems.

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/common.mk
    trunk/test/runner.rb
    trunk/win32/Makefile.sub

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 32463)
+++ ChangeLog	(revision 32464)
@@ -1,3 +1,7 @@
+Sat Jul  9 08:39:39 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* common.mk (RUN_OPT): disable gems.
+
 Sat Jul  9 08:37:05 2011  Nobuyoshi Nakada  <nobu@r...>
 
 	* io.c (rb_io_close): close(2) on a fd which is being read by
Index: common.mk
===================================================================
--- common.mk	(revision 32463)
+++ common.mk	(revision 32464)
@@ -13,6 +13,7 @@
 
 RUBYLIB       = -
 RUBYOPT       = -
+RUN_OPTS      = --disable-gems
 
 SPEC_GIT_BASE = git://github.com/rubyspec
 MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 32463)
+++ win32/Makefile.sub	(revision 32464)
@@ -270,7 +270,7 @@
 RUNRUBY = .\$(PROGRAM) -I$(srcdir)/lib -I"$(EXTOUT)/$(arch)" -I.
 !endif
 MINIRUBY = $(MINIRUBY) $(MINIRUBYOPT)
-RUNRUBY = $(RUNRUBY) "$(srcdir)/tool/runruby.rb" --extout="$(EXTOUT)" $(RUNRUBYOPT) --
+RUNRUBY = $(RUNRUBY) "$(srcdir)/tool/runruby.rb" --extout="$(EXTOUT)" $(RUNRUBYOPT) -- $(RUN_OPTS)
 !if $(CROSS_COMPILING)
 XRUBY = $(MINIRUBY)
 !else
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 32463)
+++ Makefile.in	(revision 32464)
@@ -80,7 +80,7 @@
 RUBY = $(RUBY_INSTALL_NAME)
 MINIRUBY = @MINIRUBY@\
 	$(MINIRUBYOPT)
-RUNRUBY = @RUNRUBY@ $(RUNRUBYOPT) --
+RUNRUBY = @RUNRUBY@ $(RUNRUBYOPT) -- $(RUN_OPTS)
 XRUBY = @XRUBY@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
Index: test/runner.rb
===================================================================
--- test/runner.rb	(revision 32463)
+++ test/runner.rb	(revision 32464)
@@ -4,6 +4,8 @@
 
 src_testdir = File.dirname(File.expand_path(__FILE__))
 $LOAD_PATH << src_testdir
+module Gem
+end
 class Gem::TestCase < MiniTest::Unit::TestCase
   @@project_dir = File.dirname($LOAD_PATH.last)
 end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/