From 239c30798a5fad8f73e725e1e97184c1ee788c4c Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 4 Dec 2024 11:43:46 +0900 Subject: [PATCH] Simplify test-bundler-parallel Get rid of repeated exec XRUBY recursively. --- common.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common.mk b/common.mk index 5e6a004590..dbdfdea7fc 100644 --- a/common.mk +++ b/common.mk @@ -1692,12 +1692,12 @@ test-bundler-parallel: $(TEST_RUNNABLE)-test-bundler-parallel yes-test-bundler-parallel: $(PREPARE_BUNDLER) $(gnumake_recursive)$(XRUBY) \ -r./$(arch)-fake \ + -I$(srcdir)/spec/bundler \ + -e "ruby = ENV['RUBY']" \ -e "ARGV[-1] = File.expand_path(ARGV[-1])" \ - -e "exec(*ARGV)" -- \ - $(XRUBY) -I$(srcdir)/spec/bundler \ - -e "ENV['PARALLEL_TESTS_EXECUTABLE'] = ARGV.shift" \ + -e "ENV['PARALLEL_TESTS_EXECUTABLE'] = ruby + ARGV.shift" \ -e "load ARGV.shift" \ - "$(XRUBY) -C $(srcdir) -Ispec/bundler:spec/lib .bundle/bin/rspec" \ + " -C $(srcdir) -Ispec/bundler:spec/lib .bundle/bin/rspec" \ $(srcdir)/.bundle/bin/parallel_rspec \ -o "--require spec_helper --require formatter_overrides" \ $(PARALLELRSPECOPTS) $(srcdir)/spec/bundler/$(BUNDLER_SPECS)