* common.mk (RUN_OPT): disable gems.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32464 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
01d18fe016
commit
dd2dfc71e7
@ -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>
|
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
|
* io.c (rb_io_close): close(2) on a fd which is being read by
|
||||||
|
@ -80,7 +80,7 @@ PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
|
|||||||
RUBY = $(RUBY_INSTALL_NAME)
|
RUBY = $(RUBY_INSTALL_NAME)
|
||||||
MINIRUBY = @MINIRUBY@\
|
MINIRUBY = @MINIRUBY@\
|
||||||
$(MINIRUBYOPT)
|
$(MINIRUBYOPT)
|
||||||
RUNRUBY = @RUNRUBY@ $(RUNRUBYOPT) --
|
RUNRUBY = @RUNRUBY@ $(RUNRUBYOPT) -- $(RUN_OPTS)
|
||||||
XRUBY = @XRUBY@
|
XRUBY = @XRUBY@
|
||||||
INSTALL = @INSTALL@
|
INSTALL = @INSTALL@
|
||||||
INSTALL_DATA = @INSTALL_DATA@
|
INSTALL_DATA = @INSTALL_DATA@
|
||||||
|
@ -13,6 +13,7 @@ ECHO = $(ECHO1:0=@echo)
|
|||||||
|
|
||||||
RUBYLIB = -
|
RUBYLIB = -
|
||||||
RUBYOPT = -
|
RUBYOPT = -
|
||||||
|
RUN_OPTS = --disable-gems
|
||||||
|
|
||||||
SPEC_GIT_BASE = git://github.com/rubyspec
|
SPEC_GIT_BASE = git://github.com/rubyspec
|
||||||
MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git
|
MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git
|
||||||
|
@ -4,6 +4,8 @@ require 'test/unit'
|
|||||||
|
|
||||||
src_testdir = File.dirname(File.expand_path(__FILE__))
|
src_testdir = File.dirname(File.expand_path(__FILE__))
|
||||||
$LOAD_PATH << src_testdir
|
$LOAD_PATH << src_testdir
|
||||||
|
module Gem
|
||||||
|
end
|
||||||
class Gem::TestCase < MiniTest::Unit::TestCase
|
class Gem::TestCase < MiniTest::Unit::TestCase
|
||||||
@@project_dir = File.dirname($LOAD_PATH.last)
|
@@project_dir = File.dirname($LOAD_PATH.last)
|
||||||
end
|
end
|
||||||
|
@ -270,7 +270,7 @@ MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib -I.
|
|||||||
RUNRUBY = .\$(PROGRAM) -I$(srcdir)/lib -I"$(EXTOUT)/$(arch)" -I.
|
RUNRUBY = .\$(PROGRAM) -I$(srcdir)/lib -I"$(EXTOUT)/$(arch)" -I.
|
||||||
!endif
|
!endif
|
||||||
MINIRUBY = $(MINIRUBY) $(MINIRUBYOPT)
|
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)
|
!if $(CROSS_COMPILING)
|
||||||
XRUBY = $(MINIRUBY)
|
XRUBY = $(MINIRUBY)
|
||||||
!else
|
!else
|
||||||
|
Loading…
x
Reference in New Issue
Block a user