From e10218862a3eb96d39992d889b2cdd403ee7e6ed Mon Sep 17 00:00:00 2001 From: Takashi Kokubun Date: Sun, 12 Mar 2023 23:50:47 -0700 Subject: Add btest-bruby target btest can't be used for testing RJIT because RJIT doesn't work on miniruby. However, btest-ruby is not necessarily useful for testing RJIT because both the runner could crash as well as the target. TBH I'm not sure why we want to use RUNRUBY instead of BOOTSTRAPRUBY on btest-ruby. However, to achieve what I want to do while keeping the current behavior, I'm just introducing a new target. --- common.mk | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'common.mk') diff --git a/common.mk b/common.mk index fb65c88751..b376a32eaf 100644 --- a/common.mk +++ b/common.mk @@ -760,6 +760,7 @@ $(arch:noarch=ignore)-fake.rb: $(srcdir)/template/fake.rb.in $(tooldir)/generic_ noarch-fake.rb: # prerequisite of yes-fake $(Q) exit > $@ +# runner: BASERUBY, target: miniruby btest: $(TEST_RUNNABLE)-btest no-btest: PHONY yes-btest: yes-fake miniruby$(EXEEXT) PHONY @@ -767,6 +768,7 @@ yes-btest: yes-fake miniruby$(EXEEXT) PHONY $(Q)$(gnumake_recursive)$(exec) $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(BTESTRUBY) $(RUN_OPTS)" $(OPTS) $(TESTOPTS) $(BTESTS) $(ACTIONS_ENDGROUP) +# runner: ruby, target: ruby btest-ruby: $(TEST_RUNNABLE)-btest-ruby no-btest-ruby: PHONY yes-btest-ruby: prog PHONY @@ -774,6 +776,12 @@ yes-btest-ruby: prog PHONY $(Q)$(gnumake_recursive)$(exec) $(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib $(RUN_OPTS)" $(OPTS) $(TESTOPTS) $(BTESTS) $(ACTIONS_ENDGROUP) +# runner: BASERUBY, target: ruby +btest-bruby: prog PHONY + $(ACTIONS_GROUP) + $(Q)$(gnumake_recursive)$(exec) $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib $(RUN_OPTS)" $(OPTS) $(TESTOPTS) $(BTESTS) + $(ACTIONS_ENDGROUP) + rtest: yes-fake miniruby$(EXEEXT) PHONY $(ACTIONS_GROUP) $(Q)$(exec) $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(BTESTRUBY) $(RUN_OPTS)" --sets=ractor -v -- cgit v1.2.3