diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-06-05 21:34:26 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-06-05 21:34:26 +0900 |
| commit | e11ffe0aaf1f5dc8345795097f09d094f523c9c6 (patch) | |
| tree | 0b28139158a9239d5b1c8419f9002936ba43922d /common.mk | |
| parent | 0afbfddc0d74e95e9c79090d9324cc27d9b44c32 (diff) | |
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.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3189
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -1351,11 +1351,14 @@ no-test-bundler: 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 |