diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-08 23:39:42 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-08 23:39:42 +0000 |
| commit | dd2dfc71e7c887b054c0eef930ff1a708fc2de52 (patch) | |
| tree | 1b64ffe3177182be043629bebd5c65f853af49d8 | |
| parent | 01d18fe0168ba6ba71a6652cd3ebf5a1ea478496 (diff) | |
* common.mk (RUN_OPT): disable gems.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32464 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | common.mk | 1 | ||||
| -rw-r--r-- | test/runner.rb | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
5 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Sat Jul 9 08:39:39 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * common.mk (RUN_OPT): disable gems. + Sat Jul 9 08:37:05 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> * io.c (rb_io_close): close(2) on a fd which is being read by diff --git a/Makefile.in b/Makefile.in index 531743d0e8..b1864e68e3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -80,7 +80,7 @@ PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT) RUBY = $(RUBY_INSTALL_NAME) MINIRUBY = @MINIRUBY@\ $(MINIRUBYOPT) -RUNRUBY = @RUNRUBY@ $(RUNRUBYOPT) -- +RUNRUBY = @RUNRUBY@ $(RUNRUBYOPT) -- $(RUN_OPTS) XRUBY = @XRUBY@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -13,6 +13,7 @@ ECHO = $(ECHO1:0=@echo) RUBYLIB = - RUBYOPT = - +RUN_OPTS = --disable-gems SPEC_GIT_BASE = git://github.com/rubyspec MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git diff --git a/test/runner.rb b/test/runner.rb index 608af08922..72b2360cd8 100644 --- a/test/runner.rb +++ b/test/runner.rb @@ -4,6 +4,8 @@ require 'test/unit' 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 diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 46c1bc7dcf..808966a4e0 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -270,7 +270,7 @@ MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib -I. 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 |