From b311c35bdbfec69a49aad31e3ba9accabd5e12c4 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 11 Jan 2023 18:29:55 +0900 Subject: Suppressing pending messages with RSpec --- common.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'common.mk') diff --git a/common.mk b/common.mk index 0d230dd70b..f6bdf36054 100644 --- a/common.mk +++ b/common.mk @@ -1469,8 +1469,8 @@ SYNTAX_SUGGEST_SPECS = PREPARE_SYNTAX_SUGGEST = test-syntax-suggest-prepare test-syntax-suggest: $(TEST_RUNNABLE)-test-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) + $(XRUBY) -C $(srcdir) -Ispec/syntax_suggest:spec/lib .bundle/bin/rspec \ + --require spec_helper --require formatter_overrides $(RSPECOPTS) spec/syntax_suggest/$(SYNTAX_SUGGEST_SPECS) no-test-syntax-suggest: check: $(DOT_WAIT) $(TEST_RUNNABLE)-$(PREPARE_SYNTAX_SUGGEST) test-syntax-suggest @@ -1498,8 +1498,8 @@ yes-test-bundler: $(PREPARE_BUNDLER) $(gnumake_recursive)$(XRUBY) \ -r./$(arch)-fake \ -e "exec(*ARGV)" -- \ - $(XRUBY) -C $(srcdir) -Ispec/bundler .bundle/bin/rspec \ - --require spec_helper $(RSPECOPTS) spec/bundler/$(BUNDLER_SPECS) + $(XRUBY) -C $(srcdir) -Ispec/bundler:spec/lib .bundle/bin/rspec \ + --require spec_helper --require formatter_overrides $(RSPECOPTS) spec/bundler/$(BUNDLER_SPECS) no-test-bundler: PARALLELRSPECOPTS = --runtime-log $(srcdir)/tmp/parallel_runtime_rspec.log @@ -1512,9 +1512,9 @@ yes-test-bundler-parallel: $(PREPARE_BUNDLER) $(XRUBY) -I$(srcdir)/spec/bundler \ -e "ENV['PARALLEL_TESTS_EXECUTABLE'] = ARGV.shift" \ -e "load ARGV.shift" \ - "$(XRUBY) -C $(srcdir) -Ispec/bundler .bundle/bin/rspec" \ + "$(XRUBY) -C $(srcdir) -Ispec/bundler:spec/lib .bundle/bin/rspec" \ $(srcdir)/.bundle/bin/parallel_rspec \ - -o "--require spec_helper" \ + -o "--require spec_helper --require formatter_overrides" \ $(PARALLELRSPECOPTS) $(srcdir)/spec/bundler/$(BUNDLER_SPECS) no-test-bundler-parallel: -- cgit v1.2.3