Commit e50b767a authored by earthdok@chromium.org's avatar earthdok@chromium.org

Do not reduce the number of layout_test workers in *SAN builds.

This is a partial revert of r184607. Turns out reducing the number of workers
was not the right solution for our performance issues.

BUG=427569
R=dpranke@chromium.org
NOTRY=true
TEST=test-webkitpy

Review URL: https://codereview.chromium.org/722193002

git-svn-id: svn://svn.chromium.org/blink/trunk@185303 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 7cf2524c
......@@ -270,10 +270,6 @@ class Port(object):
def default_child_processes(self):
"""Return the number of drivers to use for this port."""
if self.get_option('enable_sanitizer'):
# ASAN/MSAN/TSAN are more cpu- and memory- intensive than regular
# content_shell, and so we need to run fewer of them in parallel.
return max(int(self._executive.cpu_count() * 0.75), 1)
return self._executive.cpu_count()
def default_max_locked_shards(self):
......
......@@ -145,12 +145,6 @@ class PortTestCase(unittest.TestCase):
num_workers = port.default_child_processes()
self.assertGreaterEqual(num_workers, 1)
# Test that we reduce the number of workers for sanitizer builds.
port._options.enable_sanitizer = True
port.host.executive.cpu_count = lambda: 8
num_sanitized_workers = port.default_child_processes()
self.assertLess(num_sanitized_workers, 8)
def test_default_max_locked_shards(self):
port = self.make_port()
port.default_child_processes = lambda: 16
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment