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

ruby-changes:61583

From: Nobuyoshi <ko1@a...>
Date: Fri, 5 Jun 2020 23:08:08 +0900 (JST)
Subject: [ruby-changes:61583] e11ffe0aaf (master): Fixup test-bundler-parallel

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

From e11ffe0aaf1f5dc8345795097f09d094f523c9c6 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Fri, 5 Jun 2020 21:34:26 +0900
Subject: Fixup test-bundler-parallel

* Do not chdir in the runner process, to access miniruby.  Chdir
  in worker processes instead.
* GNU make does not export newly added environment variables by
  default, set PARALLEL_TESTS_EXECUTABLE in the runner.

diff --git a/common.mk b/common.mk
index b00a6df..2449efe 100644
--- a/common.mk
+++ b/common.mk
@@ -1351,11 +1351,14 @@ no-test-bundler: https://github.com/ruby/ruby/blob/trunk/common.mk#L1351
 
 PARALLELRSPECOPTS = --runtime-log $(srcdir)/tmp/parallel_runtime_rspec.log
 test-bundler-parallel: $(TEST_RUNNABLE)-test-bundler-parallel
-PARALLEL_TESTS_EXECUTABLE = $(XRUBY)
 yes-test-bundler-parallel: yes-test-bundler-prepare
-	$(XRUBY) -C $(srcdir) -Ispec/bundler .bundle/bin/parallel_rspec \
-		-o "--require $(srcdir)/spec/bundler/spec_helper" \
-		$(PARALLELRSPECOPTS) spec/bundler/$(BUNDLER_SPECS)
+	$(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)
 no-test-bundler-parallel:
 
 GEM = up
-- 
cgit v0.10.2


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

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