diff options
Diffstat (limited to 'spec/mspec/lib')
-rwxr-xr-x | spec/mspec/lib/mspec/commands/mspec.rb | 2 | ||||
-rw-r--r-- | spec/mspec/lib/mspec/utils/script.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/mspec/lib/mspec/commands/mspec.rb b/spec/mspec/lib/mspec/commands/mspec.rb index f18d836252..bd34d5f0da 100755 --- a/spec/mspec/lib/mspec/commands/mspec.rb +++ b/spec/mspec/lib/mspec/commands/mspec.rb @@ -98,7 +98,7 @@ class MSpecMain < MSpecScript end output_files = [] - processes = [cores, @files.size].min + processes = cores(@files.size) children = processes.times.map { |i| name = tmp "mspec-multi-#{i}" output_files << name diff --git a/spec/mspec/lib/mspec/utils/script.rb b/spec/mspec/lib/mspec/utils/script.rb index 3e507d2b4a..910dcd22a7 100644 --- a/spec/mspec/lib/mspec/utils/script.rb +++ b/spec/mspec/lib/mspec/utils/script.rb @@ -234,9 +234,9 @@ class MSpecScript files patterns end - def cores + def cores(max = 1) require 'etc' - Etc.nprocessors + [Etc.nprocessors, max].min end def setup_env |