diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | spec/mspec/lib/mspec/commands/mspec.rb | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 49d85abb76..e68b5d4142 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,7 +62,7 @@ before_script: script: - "make -s test TESTOPTS=--color=never" - "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. branches: 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+") } |