diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-16 23:59:33 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-16 23:59:33 +0000 |
| commit | 2c1e74edb1c6518c3c25d922d29c1ad44d1ad7a0 (patch) | |
| tree | 5231b12ec03f848ae3b7db4272c60476737bf7cd /spec/mspec | |
| parent | 5eb7aa5c02a9c89708648104a0761d564dc22b27 (diff) | |
| download | ruby-2c1e74edb1c6518c3c25d922d29c1ad44d1ad7a0.tar.gz | |
default.mspec: limit cores
* spec/default.mspec (MSpecScript::JobServer#cores): limit max
number of processors, not to acquire tokens more than necessary.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59103 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'spec/mspec')
| -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 |