diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-12-24 20:18:10 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-12-24 20:18:10 +0900 |
| commit | 18c1ca8f4c0748905d5cedb6c044df507ea8ad6a (patch) | |
| tree | 99b3220eacf24de5bb5b8336650dfd9ceb29e58e /common.mk | |
| parent | 3fb1d49a1f1289142f3da8e876133bd7f459e4f6 (diff) | |
Fix test-syntax-suggest order
Prepare for test-syntax-suggest after other tests finished.
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -766,8 +766,7 @@ clean-spec: PHONY -$(Q) $(RMDIRS) $(RUBYSPEC_CAPIEXT) 2> $(NULL) || $(NULLCMD) -$(Q) $(RMALL) rubyspec_temp -check: main $(DOT_WAIT) test $(DOT_WAIT) test-tool $(DOT_WAIT) test-all \ - $(DOT_WAIT) test-spec $(DOT_WAIT) test-syntax-suggest +check: main $(DOT_WAIT) test $(DOT_WAIT) test-tool $(DOT_WAIT) test-all $(ECHO) check succeeded -$(Q) : : "run only on sh"; \ if [ x"$(GIT)" != x ] && $(CHDIR) "$(srcdir)" && \ @@ -903,6 +902,8 @@ yes-test-spec: test-spec-precheck $(ACTIONS_ENDGROUP) no-test-spec: +check: $(DOT_WAIT) test-spec + RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable runnable: $(RUNNABLE) prog $(tooldir)/mkrunnable.rb PHONY $(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: 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 yes-test-syntax-suggest-prepare: yes-test-syntax-suggest-precheck $(ACTIONS_GROUP) @@ -1464,13 +1466,15 @@ yes-test-syntax-suggest-prepare: yes-test-syntax-suggest-precheck RSPECOPTS = 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 -yes-test-syntax-suggest: $(PREPARE_SYNTAX_SUGGEST) +yes-test-syntax-suggest: yes-$(PREPARE_SYNTAX_SUGGEST) $(XRUBY) -C $(srcdir) -Ispec/syntax_suggest .bundle/bin/rspec \ --require spec_helper $(RSPECOPTS) spec/syntax_suggest/$(SYNTAX_SUGGEST_SPECS) no-test-syntax-suggest: +check: $(DOT_WAIT) $(TEST_RUNNABLE)-$(PREPARE_SYNTAX_SUGGEST) test-syntax-suggest + test-bundler-precheck: $(TEST_RUNNABLE)-test-bundler-precheck no-test-bundler-precheck: yes-test-bundler-precheck: main $(arch)-fake.rb |