aboutsummaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-05-27 03:43:02 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-05-27 03:43:02 +0000
commit60bd5d809a0aa8c14e14d431a99936862223def4 (patch)
tree150fd3ec7745fce2f3d96dfc59acb457599fce26 /spec
parent90bac036a4450271b77e27ee112b4ce1c32b82fd (diff)
downloadruby-60bd5d809a0aa8c14e14d431a99936862223def4.tar.gz
mspec/commands/mspec.rb: formatter for multi_exec
* 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
Diffstat (limited to 'spec')
-rwxr-xr-xspec/mspec/lib/mspec/commands/mspec.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/mspec/lib/mspec/commands/mspec.rb b/spec/mspec/lib/mspec/commands/mspec.rb
index 6f1ae8cb6e..f18d836252 100755
--- a/spec/mspec/lib/mspec/commands/mspec.rb
+++ b/spec/mspec/lib/mspec/commands/mspec.rb
@@ -44,7 +44,6 @@ class MSpecMain < MSpecScript
options.on("-j", "--multi", "Run multiple (possibly parallel) subprocesses") do
config[:multi] = true
- config[:options] << "-fy"
end
options.version MSpec::VERSION do
@@ -94,6 +93,9 @@ class MSpecMain < MSpecScript
require 'mspec/runner/formatters/multi'
formatter = MultiFormatter.new
+ if config[:formatter]
+ warn "formatter options is ignored due to multi option"
+ end
output_files = []
processes = [cores, @files.size].min
@@ -105,7 +107,7 @@ class MSpecMain < MSpecScript
"SPEC_TEMP_DIR" => "rubyspec_temp_#{i}",
"MSPEC_MULTI" => i.to_s
}
- command = argv + ["-o", name]
+ command = argv + ["-fy", "-o", name]
$stderr.puts "$ #{command.join(' ')}" if $MSPEC_DEBUG
IO.popen([env, *command], "rb+")
}