From f45bed0a6e983abfe616455ced2e50db381ba2dd Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Thu, 25 Mar 2021 18:06:06 +0900 Subject: [PATCH] Use XRUBY to expand path instead of platform dependent --- common.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/common.mk b/common.mk index f3df20d0be..6d3e2d274b 100644 --- a/common.mk +++ b/common.mk @@ -1385,14 +1385,16 @@ no-test-bundler: PARALLELRSPECOPTS = --runtime-log $(srcdir)/tmp/parallel_runtime_rspec.log test-bundler-parallel: $(TEST_RUNNABLE)-test-bundler-parallel yes-test-bundler-parallel: yes-test-bundler-prepare - d=`cd "$(srcdir)" && pwd` && \ - $(XRUBY) -I$(srcdir)/spec/bundler \ + $(XRUBY) \ + -e "ARGV[-1] = File.expand_path(ARGV[-1])" \ + -e "exec(*ARGV)" -- \ + $(XRUBY) -I$(srcdir)/spec/bundler \ -e "ENV['PARALLEL_TESTS_EXECUTABLE'] = ARGV.shift" \ -e "load ARGV.shift" \ "$(XRUBY) -C $(srcdir) -Ispec/bundler .bundle/bin/rspec" \ $(srcdir)/.bundle/bin/parallel_rspec \ -o "--require spec_helper" \ - $(PARALLELRSPECOPTS) "$$d"/spec/bundler/$(BUNDLER_SPECS) + $(PARALLELRSPECOPTS) $(srcdir)/spec/bundler/$(BUNDLER_SPECS) no-test-bundler-parallel: GEM = up