Skip to content

Commit 239c307

Browse files
nobuhsbt
authored andcommitted
Simplify test-bundler-parallel
Get rid of repeated exec XRUBY recursively.
1 parent 59f7a5d commit 239c307

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

common.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1692,12 +1692,12 @@ test-bundler-parallel: $(TEST_RUNNABLE)-test-bundler-parallel
16921692
yes-test-bundler-parallel: $(PREPARE_BUNDLER)
16931693
$(gnumake_recursive)$(XRUBY) \
16941694
-r./$(arch)-fake \
1695+
-I$(srcdir)/spec/bundler \
1696+
-e "ruby = ENV['RUBY']" \
16951697
-e "ARGV[-1] = File.expand_path(ARGV[-1])" \
1696-
-e "exec(*ARGV)" -- \
1697-
$(XRUBY) -I$(srcdir)/spec/bundler \
1698-
-e "ENV['PARALLEL_TESTS_EXECUTABLE'] = ARGV.shift" \
1698+
-e "ENV['PARALLEL_TESTS_EXECUTABLE'] = ruby + ARGV.shift" \
16991699
-e "load ARGV.shift" \
1700-
"$(XRUBY) -C $(srcdir) -Ispec/bundler:spec/lib .bundle/bin/rspec" \
1700+
" -C $(srcdir) -Ispec/bundler:spec/lib .bundle/bin/rspec" \
17011701
$(srcdir)/.bundle/bin/parallel_rspec \
17021702
-o "--require spec_helper --require formatter_overrides" \
17031703
$(PARALLELRSPECOPTS) $(srcdir)/spec/bundler/$(BUNDLER_SPECS)

0 commit comments

Comments
 (0)