diff options
| author | nagachika <nagachika@ruby-lang.org> | 2022-10-21 15:12:41 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2022-10-21 15:12:41 +0900 |
| commit | c740605d425a472fb9d4451791bd75c327aa7aa5 (patch) | |
| tree | eb11805f2691e098a1730dbb180f84fe16a73428 | |
| parent | 57d14154a2e85bec2a5589810a4aa250b82ab864 (diff) | |
merge revision(s) 97ce030954dab3f219779e235bee53ba408fbaca:
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(-)
| -rw-r--r-- | common.mk | 8 | ||||
| -rw-r--r-- | template/Makefile.in | 3 | ||||
| -rw-r--r-- | template/fake.rb.in | 2 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
5 files changed, 9 insertions, 8 deletions
@@ -771,7 +771,7 @@ noarch-fake.rb: # prerequisite of yes-fake btest: $(TEST_RUNNABLE)-btest no-btest: PHONY -yes-btest: fake miniruby$(EXEEXT) PHONY +yes-btest: yes-fake miniruby$(EXEEXT) PHONY $(ACTIONS_GROUP) $(Q)$(exec) $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(BTESTRUBY) $(RUN_OPTS)" $(OPTS) $(TESTOPTS) $(BTESTS) $(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) $(ACTIONS_ENDGROUP) -rtest: fake miniruby$(EXEEXT) PHONY +rtest: yes-fake miniruby$(EXEEXT) PHONY $(ACTIONS_GROUP) $(Q)$(exec) $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(BTESTRUBY) $(RUN_OPTS)" --sets=ractor -v $(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) runruby: $(PROGRAM) PHONY @@ -1260,7 +1260,7 @@ runruby: $(PROGRAM) PHONY runirb: $(PROGRAM) PHONY 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) bisect: PHONY diff --git a/template/Makefile.in b/template/Makefile.in index 5e776e3a57..55f03e6ed2 100644 --- a/template/Makefile.in +++ b/template/Makefile.in @@ -147,8 +147,7 @@ RUNRUBY = @RUNRUBY@ $(RUN_OPTS) # RUNRUBY_DEBUGGER:: debugging option for runruby.rb RUNRUBY_DEBUGGER = --debugger='gdb -x run.gdb --quiet --args' XRUBY = @XRUBY@ -BTESTRUBY = @BTESTRUBY@\ - $(MINIRUBYOPT) +BTESTRUBY = @BTESTRUBY@ -r./$(arch)-fake INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/template/fake.rb.in b/template/fake.rb.in index 2280a4d8e7..7af17fa344 100644 --- a/template/fake.rb.in +++ b/template/fake.rb.in @@ -1,3 +1,5 @@ +# frozen_string_literal: true +# shareable_constant_value: literal <% arg = {} while /\A(\w+)=(.*)/ =~ ARGV[0] @@ -11,7 +11,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 3 #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_MONTH 10 diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 18871528a7..244725a016 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -389,7 +389,7 @@ BOOTSTRAPRUBY = $(MINIRUBY) BOOTSTRAPRUBY_OPT = XRUBY = $(RUNRUBY) !endif -BTESTRUBY = $(MINIRUBY) +BTESTRUBY = $(MINIRUBY) -r./$(arch)-fake !ifndef RUBY RUBY = ruby !endif |