1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix test-syntax-suggest order

Browse Source 
Prepare for test-syntax-suggest after other tests finished.
This commit is contained in:
Nobuyoshi Nakada 2022-12-24 20:18:10 +09:00
parent 3fb1d49a1f
commit 18c1ca8f4c
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common.mk
View File

@ -766,8 +766,7 @@ clean-spec: PHONY
-$(Q) $(RMDIRS) $(RUBYSPEC_CAPIEXT) 2> $(NULL) || $(NULLCMD) -$(Q) $(RMDIRS) $(RUBYSPEC_CAPIEXT) 2> $(NULL) || $(NULLCMD)
-$(Q) $(RMALL) rubyspec_temp -$(Q) $(RMALL) rubyspec_temp
check: main $(DOT_WAIT) test $(DOT_WAIT) test-tool $(DOT_WAIT) test-all \ check: main $(DOT_WAIT) test $(DOT_WAIT) test-tool $(DOT_WAIT) test-all
$(DOT_WAIT) test-spec $(DOT_WAIT) test-syntax-suggest
$(ECHO) check succeeded $(ECHO) check succeeded
-$(Q) : : "run only on sh"; \ -$(Q) : : "run only on sh"; \
if [ x"$(GIT)" != x ] && $(CHDIR) "$(srcdir)" && \ if [ x"$(GIT)" != x ] && $(CHDIR) "$(srcdir)" && \
@ -903,6 +902,8 @@ yes-test-spec: test-spec-precheck
$(ACTIONS_ENDGROUP) $(ACTIONS_ENDGROUP)
no-test-spec: no-test-spec:
check: $(DOT_WAIT) test-spec
RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable
runnable: $(RUNNABLE) prog $(tooldir)/mkrunnable.rb PHONY runnable: $(RUNNABLE) prog $(tooldir)/mkrunnable.rb PHONY
$(Q) $(MINIRUBY) $(tooldir)/mkrunnable.rb -v $(EXTOUT) $(Q) $(MINIRUBY) $(tooldir)/mkrunnable.rb -v $(EXTOUT)
@ -1455,6 +1456,7 @@ test-syntax-suggest-precheck: $(TEST_RUNNABLE)-test-syntax-suggest-precheck
no-test-syntax-suggest-precheck: no-test-syntax-suggest-precheck:
yes-test-syntax-suggest-precheck: main yes-test-syntax-suggest-precheck: main
test-syntax-suggest-prepare: $(TEST_RUNNABLE)-test-syntax-suggest-prepare
no-test-syntax-suggest-prepare: no-test-syntax-suggest-precheck no-test-syntax-suggest-prepare: no-test-syntax-suggest-precheck
yes-test-syntax-suggest-prepare: yes-test-syntax-suggest-precheck yes-test-syntax-suggest-prepare: yes-test-syntax-suggest-precheck
$(ACTIONS_GROUP) $(ACTIONS_GROUP)
@ -1464,13 +1466,15 @@ yes-test-syntax-suggest-prepare: yes-test-syntax-suggest-precheck
RSPECOPTS = RSPECOPTS =
SYNTAX_SUGGEST_SPECS = SYNTAX_SUGGEST_SPECS =
PREPARE_SYNTAX_SUGGEST = yes-test-syntax-suggest-prepare PREPARE_SYNTAX_SUGGEST = test-syntax-suggest-prepare
test-syntax-suggest: $(TEST_RUNNABLE)-test-syntax-suggest test-syntax-suggest: $(TEST_RUNNABLE)-test-syntax-suggest
yes-test-syntax-suggest: $(PREPARE_SYNTAX_SUGGEST) yes-test-syntax-suggest: yes-$(PREPARE_SYNTAX_SUGGEST)
$(XRUBY) -C $(srcdir) -Ispec/syntax_suggest .bundle/bin/rspec \ $(XRUBY) -C $(srcdir) -Ispec/syntax_suggest .bundle/bin/rspec \
--require spec_helper $(RSPECOPTS) spec/syntax_suggest/$(SYNTAX_SUGGEST_SPECS) --require spec_helper $(RSPECOPTS) spec/syntax_suggest/$(SYNTAX_SUGGEST_SPECS)
no-test-syntax-suggest: no-test-syntax-suggest:
check: $(DOT_WAIT) $(TEST_RUNNABLE)-$(PREPARE_SYNTAX_SUGGEST) test-syntax-suggest
test-bundler-precheck: $(TEST_RUNNABLE)-test-bundler-precheck test-bundler-precheck: $(TEST_RUNNABLE)-test-bundler-precheck
no-test-bundler-precheck: no-test-bundler-precheck:
yes-test-bundler-precheck: main $(arch)-fake.rb yes-test-bundler-precheck: main $(arch)-fake.rb

2
defs/gmake.mk
View File

@ -84,7 +84,7 @@ endif
ORDERED_TEST_TARGETS := $(filter $(TEST_TARGETS), \ ORDERED_TEST_TARGETS := $(filter $(TEST_TARGETS), \
btest-ruby test-knownbug test-basic \ btest-ruby test-knownbug test-basic \
test-testframework test-tool test-ruby test-all \ test-testframework test-tool test-ruby test-all \
test-spec test-syntax-suggest \ test-spec test-syntax-suggest-prepare test-syntax-suggest \
test-bundler-prepare test-bundler test-bundler-parallel \ test-bundler-prepare test-bundler test-bundler-parallel \
test-bundled-gems-precheck test-bundled-gems-fetch \ test-bundled-gems-precheck test-bundled-gems-fetch \
test-bundled-gems-prepare test-bundled-gems-run \ test-bundled-gems-prepare test-bundled-gems-run \