summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrnk@chromium.org <rnk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-16 13:31:15 +0000
committerrnk@chromium.org <rnk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-16 13:31:15 +0000
commit5c01d9cdf1fea994b5393cb32dbff1c84a3575f3 (patch)
treecaeef3a5bfa7a7475862c8ae0aebcee73811efad
parent14811d3b3c0a84caa9aa7fd46770422057865d3f (diff)
downloadchromium_src-5c01d9cdf1fea994b5393cb32dbff1c84a3575f3.zip
chromium_src-5c01d9cdf1fea994b5393cb32dbff1c84a3575f3.tar.gz
chromium_src-5c01d9cdf1fea994b5393cb32dbff1c84a3575f3.tar.bz2
Reduce valgrind layout tests parallelism to avoid OOM
R=timurrrr@chromium.org BUG=260627 NOTRY=true Review URL: https://chromiumcodereview.appspot.com/19362003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211789 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-xtools/valgrind/chrome_tests.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py
index ce5c8ab..f645b77 100755
--- a/tools/valgrind/chrome_tests.py
+++ b/tools/valgrind/chrome_tests.py
@@ -7,6 +7,7 @@
import glob
import logging
+import multiprocessing
import optparse
import os
import stat
@@ -428,9 +429,14 @@ class ChromeTests:
os.makedirs(out_dir)
script = os.path.join(self._source_dir, "webkit", "tools", "layout_tests",
"run_webkit_tests.py")
+ # http://crbug.com/260627: After the switch to content_shell from DRT, each
+ # test now brings up 3 processes. Under Valgrind, they become memory bound
+ # and can eventually OOM if we don't reduce the total count.
+ 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.