summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroshi SHIBATA <hsbt@ruby-lang.org>2019-08-22 08:02:48 +1000
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2019-08-22 08:02:48 +1000
commit0b0fedad7098b70686ef9f3c931a8c9c93d5b00c (patch)
treecaf5376b9548d72abb631c46bf0df843e19be0d7
parent800821831d6b4319e82d23291d3127212a2e7334 (diff)
downloadruby-0b0fedad7098b70686ef9f3c931a8c9c93d5b00c.tar.gz
Introduce test-bundler-parallel task.
-rw-r--r--.rspec_parallel2
-rw-r--r--common.mk10
2 files changed, 11 insertions, 1 deletions
diff --git a/.rspec_parallel b/.rspec_parallel
new file mode 100644
index 0000000000..aaff198a32
--- /dev/null
+++ b/.rspec_parallel
@@ -0,0 +1,2 @@
+--format progress
+--format ParallelTests::RSpec::RuntimeLogger --out tmp/parallel_runtime_rspec.log
diff --git a/common.mk b/common.mk
index 23973260d6..039e20e1f0 100644
--- a/common.mk
+++ b/common.mk
@@ -1293,7 +1293,7 @@ test-bundler-precheck: $(arch)-fake.rb programs
yes-test-bundler-prepare: test-bundler-precheck
$(XRUBY) -C "$(srcdir)" bin/gem install --no-document \
- --install-dir .bundle --conservative "rspec:~> 3.5" "rake:~> 12.0"
+ --install-dir .bundle --conservative "rspec:~> 3.5" "rake:~> 12.0" "parallel_tests:~> 2.29"
RSPECOPTS = --format progress
BUNDLER_SPECS =
@@ -1303,6 +1303,14 @@ yes-test-bundler: yes-test-bundler-prepare
--require spec_helper $(RSPECOPTS) spec/bundler/$(BUNDLER_SPECS)
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
+ $(XRUBY) -C $(srcdir) -Ispec/bundler .bundle/bin/parallel_rspec \
+ -o "--require ${srcdir}/spec/bundler/spec_helper --require ${srcdir}/spec/bundler/support/parallel" \
+ ${PARALLELRSPECOPTS} spec/bundler/$(BUNDLER_SPECS)
+no-test-bundler-parallel:
+
GEM = up
sync-default-gems:
$(Q) $(XRUBY) -C "$(srcdir)" tool/sync_default_gems.rb $(GEM)