1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mspec/commands/mspec.rb: formatter for multi_exec

Browse Source 
* spec/mspec/lib/mspec/commands/mspec.rb (MSpecMain#multi_exec):
  as multi_exec children must run with yaml formatter, append the
  option for it after other options to override another formatter
  option with a warning if it is given.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58918 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-05-27 03:43:02 +00:00
parent 944c8f400c
commit 8e81b3c766
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -62,7 +62,7 @@ before_script:
script: script:
- "make -s test TESTOPTS=--color=never" - "make -s test TESTOPTS=--color=never"
- "make -s $JOBS test-all TESTOPTS='-q --color=never --job-status=normal'" - "make -s $JOBS test-all TESTOPTS='-q --color=never --job-status=normal'"
- "make -s $JOBS test-rubyspec MSPECOPT=-fm" - "make -s $JOBS test-rubyspec MSPECOPT=-j"
# Branch matrix. Not all branches are Travis-ready so we limit branches here. # Branch matrix. Not all branches are Travis-ready so we limit branches here.
branches: branches:

6
spec/mspec/lib/mspec/commands/mspec.rb
View File

@ -44,7 +44,6 @@ class MSpecMain < MSpecScript
options.on("-j", "--multi", "Run multiple (possibly parallel) subprocesses") do options.on("-j", "--multi", "Run multiple (possibly parallel) subprocesses") do
config[:multi] = true config[:multi] = true
config[:options] << "-fy"
end end
options.version MSpec::VERSION do options.version MSpec::VERSION do
@ -94,6 +93,9 @@ class MSpecMain < MSpecScript
require 'mspec/runner/formatters/multi' require 'mspec/runner/formatters/multi'
formatter = MultiFormatter.new formatter = MultiFormatter.new
if config[:formatter]
warn "formatter options is ignored due to multi option"
end
output_files = [] output_files = []
processes = [cores, @files.size].min processes = [cores, @files.size].min
@ -105,7 +107,7 @@ class MSpecMain < MSpecScript
"SPEC_TEMP_DIR" => "rubyspec_temp_#{i}", "SPEC_TEMP_DIR" => "rubyspec_temp_#{i}",
"MSPEC_MULTI" => i.to_s "MSPEC_MULTI" => i.to_s
} }
command = argv + ["-o", name] command = argv + ["-fy", "-o", name]
$stderr.puts "$ #{command.join(' ')}" if $MSPEC_DEBUG $stderr.puts "$ #{command.join(' ')}" if $MSPEC_DEBUG
IO.popen([env, *command], "rb+") IO.popen([env, *command], "rb+")
} }