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

Use same RSPECOPTS for test-bundler and test-bundler-parallel

Browse Source
This commit is contained in:
Hiroshi SHIBATA 2024-12-04 11:55:06 +09:00
parent 239c30798a
commit b532662d2d
Notes: git 2025-05-14 12:41:59 +00:00 
Merged: https://github.com/ruby/ruby/pull/12252
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common.mk
View File

@ -1675,7 +1675,7 @@ yes-test-bundler-prepare: yes-test-bundler-precheck
-e 'load "spec/bundler/support/bundle.rb"' -- install --quiet --gemfile=tool/bundler/dev_gems.rb
$(ACTIONS_ENDGROUP)
RSPECOPTS =
RSPECOPTS = --require spec_helper --require formatter_overrides
BUNDLER_SPECS =
PREPARE_BUNDLER = $(TEST_RUNNABLE)-test-bundler-prepare
test-bundler: $(TEST_RUNNABLE)-test-bundler
@ -1684,7 +1684,7 @@ yes-test-bundler: $(PREPARE_BUNDLER)
-r./$(arch)-fake \
-e "exec(*ARGV)" -- \
$(XRUBY) -C $(srcdir) -Ispec/bundler:spec/lib .bundle/bin/rspec \
--require spec_helper --require formatter_overrides $(RSPECOPTS) spec/bundler/$(BUNDLER_SPECS)
$(RSPECOPTS) spec/bundler/$(BUNDLER_SPECS)
no-test-bundler:
PARALLELRSPECOPTS = --runtime-log $(srcdir)/tmp/parallel_runtime_rspec.log
@ -1697,9 +1697,8 @@ yes-test-bundler-parallel: $(PREPARE_BUNDLER)
-e "ARGV[-1] = File.expand_path(ARGV[-1])" \
-e "ENV['PARALLEL_TESTS_EXECUTABLE'] = ruby + ARGV.shift" \
-e "load ARGV.shift" \
" -C $(srcdir) -Ispec/bundler:spec/lib .bundle/bin/rspec" \
" -C $(srcdir) -Ispec/bundler:spec/lib .bundle/bin/rspec $(RSPECOPTS)" \
$(srcdir)/.bundle/bin/parallel_rspec \
-o "--require spec_helper --require formatter_overrides" \
$(PARALLELRSPECOPTS) $(srcdir)/spec/bundler/$(BUNDLER_SPECS)
no-test-bundler-parallel: