kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Load fake.rb at BTESTRUBY

Browse source 
So that `mkmf` checks work from `make run`, and also remove
duplicate `$(MINIRUBYOPT)` which is used in `$(MINIRUBY)`.
This commit is contained in:
Nobuyoshi Nakada 2022-04-01 20:15:00 +09:00
parent d9c6f8d45c
commit 97ce030954
Notes: git 2022-04-05 22:36:00 +09:00
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
common.mk
View file

@ -765,7 +765,7 @@ $(arch)-fake.rb: $(srcdir)/template/fake.rb.in $(tooldir)/generic_erb.rb version
btest: $(TEST_RUNNABLE)-btest btest: $(TEST_RUNNABLE)-btest
no-btest: PHONY no-btest: PHONY
yes-btest: fake miniruby$(EXEEXT) PHONY yes-btest: yes-fake miniruby$(EXEEXT) PHONY
$(ACTIONS_GROUP) $(ACTIONS_GROUP)
$(Q)$(exec) $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(BTESTRUBY) $(RUN_OPTS)" $(OPTS) $(TESTOPTS) $(BTESTS) $(Q)$(exec) $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(BTESTRUBY) $(RUN_OPTS)" $(OPTS) $(TESTOPTS) $(BTESTS)
$(ACTIONS_ENDGROUP) $(ACTIONS_ENDGROUP)
@ -777,7 +777,7 @@ yes-btest-ruby: prog PHONY
$(Q)$(exec) $(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib $(RUN_OPTS)" -q $(OPTS) $(TESTOPTS) $(BTESTS) $(Q)$(exec) $(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib $(RUN_OPTS)" -q $(OPTS) $(TESTOPTS) $(BTESTS)
$(ACTIONS_ENDGROUP) $(ACTIONS_ENDGROUP)
rtest: fake miniruby$(EXEEXT) PHONY rtest: yes-fake miniruby$(EXEEXT) PHONY
$(ACTIONS_GROUP) $(ACTIONS_GROUP)
$(Q)$(exec) $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(BTESTRUBY) $(RUN_OPTS)" --sets=ractor -v $(Q)$(exec) $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(BTESTRUBY) $(RUN_OPTS)" --sets=ractor -v
$(ACTIONS_ENDGROUP) $(ACTIONS_ENDGROUP)
@ -1243,7 +1243,7 @@ $(srcdir)/ext/etc/constdefs.h: $(srcdir)/ext/etc/depend
## ##
run: fake miniruby$(EXEEXT) PHONY run: yes-fake miniruby$(EXEEXT) PHONY
$(BTESTRUBY) $(RUNOPT0) $(TESTRUN_SCRIPT) $(RUNOPT) $(BTESTRUBY) $(RUNOPT0) $(TESTRUN_SCRIPT) $(RUNOPT)
runruby: $(PROGRAM) PHONY runruby: $(PROGRAM) PHONY
@ -1252,7 +1252,7 @@ runruby: $(PROGRAM) PHONY
runirb: $(PROGRAM) PHONY runirb: $(PROGRAM) PHONY
RUBY_ON_BUG='gdb -x $(srcdir)/.gdbinit -p' $(RUNRUBY) $(RUNOPT0) -r irb -e 'IRB.start("make runirb")' $(RUNOPT) RUBY_ON_BUG='gdb -x $(srcdir)/.gdbinit -p' $(RUNRUBY) $(RUNOPT0) -r irb -e 'IRB.start("make runirb")' $(RUNOPT)
parse: fake miniruby$(EXEEXT) PHONY parse: yes-fake miniruby$(EXEEXT) PHONY
$(BTESTRUBY) --dump=parsetree_with_comment,insns $(TESTRUN_SCRIPT) $(BTESTRUBY) --dump=parsetree_with_comment,insns $(TESTRUN_SCRIPT)
bisect: PHONY bisect: PHONY

3
template/Makefile.in
View file

@ -147,8 +147,7 @@ RUNRUBY = @RUNRUBY@ $(RUN_OPTS)
# RUNRUBY_DEBUGGER:: debugging option for runruby.rb # RUNRUBY_DEBUGGER:: debugging option for runruby.rb
RUNRUBY_DEBUGGER = --debugger='gdb -x run.gdb --quiet --args' RUNRUBY_DEBUGGER = --debugger='gdb -x run.gdb --quiet --args'
XRUBY = @XRUBY@ XRUBY = @XRUBY@
BTESTRUBY = @BTESTRUBY@\ BTESTRUBY = @BTESTRUBY@ -r./$(arch)-fake
$(MINIRUBYOPT)
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@

2
template/fake.rb.in
View file

@ -1,3 +1,5 @@
# frozen_string_literal: true
# shareable_constant_value: literal
<% <%
arg = {} arg = {}
while /\A(\w+)=(.*)/ =~ ARGV[0] while /\A(\w+)=(.*)/ =~ ARGV[0]

2
win32/Makefile.sub
View file

@ -385,7 +385,7 @@ BOOTSTRAPRUBY = $(BASERUBY)
BOOTSTRAPRUBY = $(MINIRUBY) BOOTSTRAPRUBY = $(MINIRUBY)
XRUBY = $(RUNRUBY) XRUBY = $(RUNRUBY)
!endif !endif
BTESTRUBY = $(MINIRUBY) BTESTRUBY = $(MINIRUBY) -r./$(arch)-fake
!ifndef RUBY !ifndef RUBY
RUBY = ruby RUBY = ruby
!endif !endif