archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 17:14:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge revision(s) 97ce030954:

Browse source 
Load fake.rb at `BTESTRUBY`

	So that `mkmf` checks work from `make run`, and also remove
	duplicate `$(MINIRUBYOPT)` which is used in `$(MINIRUBY)`.
	---
	 common.mk            | 8 ++++----
	 template/Makefile.in | 3 +--
	 template/fake.rb.in  | 2 ++
	 win32/Makefile.sub   | 2 +-
	 4 files changed, 8 insertions(+), 7 deletions(-)
This commit is contained in:
nagachika 2022-10-21 15:12:41 +09:00
parent 57d14154a2
commit c740605d42
5 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
common.mk
View file

@ -771,7 +771,7 @@ noarch-fake.rb: # prerequisite of yes-fake
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)
@ -783,7 +783,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)
@ -1251,7 +1251,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
@ -1260,7 +1260,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
version.h
View file

@ -11,7 +11,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 3 #define RUBY_VERSION_TEENY 3
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 142 #define RUBY_PATCHLEVEL 143
#define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_YEAR 2022
#define RUBY_RELEASE_MONTH 10 #define RUBY_RELEASE_MONTH 10

2
win32/Makefile.sub
View file

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