diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-13 22:01:22 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-13 22:01:22 +0000 |
| commit | 2ea492e0d679fe6cf27072dddc0a0c681cca3513 (patch) | |
| tree | 6451ebfe51ded1aa621c5a81fd43cfa2e2ececa0 /tools/heapcheck | |
| parent | 4888df096aa6176a79554dd72d78de585750c6ab (diff) | |
| download | chromium_src-2ea492e0d679fe6cf27072dddc0a0c681cca3513.zip chromium_src-2ea492e0d679fe6cf27072dddc0a0c681cca3513.tar.gz chromium_src-2ea492e0d679fe6cf27072dddc0a0c681cca3513.tar.bz2 | |
Heapcheck: Update layout tests code to match that of Valgrind's.
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/20202003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223135 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/heapcheck')
| -rwxr-xr-x | tools/heapcheck/chrome_tests.py | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/tools/heapcheck/chrome_tests.py b/tools/heapcheck/chrome_tests.py index 5d1e9d9..d5ba2e94 100755 --- a/tools/heapcheck/chrome_tests.py +++ b/tools/heapcheck/chrome_tests.py @@ -11,6 +11,7 @@ TODO(glider): put common functions to a standalone module. import glob import logging +import multiprocessing import optparse import os import stat @@ -375,8 +376,18 @@ class ChromeTests(object): script = os.path.join(self._source_dir, "webkit", "tools", "layout_tests", "run_webkit_tests.py") - script_cmd = ["python", script, "--run-singly", "-v", - "--noshow-results", "--time-out-ms=200000", + # While Heapcheck is not memory bound like Valgrind for running layout tests + # in parallel, it is still CPU bound. Many machines have hyper-threading + # turned on, so the real number of cores is actually half. + jobs = int(multiprocessing.cpu_count() * 0.5) + script_cmd = ["python", script, "-v", + "--run-singly", # run a separate DumpRenderTree for each test + "--fully-parallel", + "--child-processes=%d" % jobs, + "--time-out-ms=200000", + "--no-retry-failures", # retrying takes too much time + # http://crbug.com/176908: Don't launch a browser when done. + "--no-show-results", "--nocheck-sys-deps"] # Pass build mode to run_webkit_tests.py. We aren't passed it directly, |