[前][次][番号順一覧][スレッド一覧]

ruby-changes:65651

From: Kazuhiro <ko1@a...>
Date: Thu, 25 Mar 2021 14:59:44 +0900 (JST)
Subject: [ruby-changes:65651] 12812c2bdf (master): Fix test-bundler-parallel errors when out-of-place build

https://git.ruby-lang.org/ruby.git/commit/?id=12812c2bdf

From 12812c2bdf146805fedec79d299c2fa120a117fc Mon Sep 17 00:00:00 2001
From: Kazuhiro NISHIYAMA <zn@m...>
Date: Thu, 25 Mar 2021 14:58:19 +0900
Subject: Fix test-bundler-parallel errors when out-of-place build

---
 common.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common.mk b/common.mk
index 102a58a..0e632a5 100644
--- a/common.mk
+++ b/common.mk
@@ -1384,13 +1384,14 @@ no-test-bundler: https://github.com/ruby/ruby/blob/trunk/common.mk#L1384
 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 \
 		-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) $(srcdir)/spec/bundler/$(BUNDLER_SPECS)
+		$(PARALLELRSPECOPTS) "$$d"/spec/bundler/$(BUNDLER_SPECS)
 no-test-bundler-parallel:
 
 GEM = up
-- 
cgit v1.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]