summaryrefslogtreecommitdiffstats
path: root/webkit/tools/layout_tests/run_webkit_tests.py
diff options
context:
space:
mode:
authorojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-09 22:52:38 +0000
committerojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-09 22:52:38 +0000
commit84610ad991df4481b9ecb9baaeef09d9131beaa4 (patch)
treeaa82e22a084b1039b7182dab776a1c327e127b89 /webkit/tools/layout_tests/run_webkit_tests.py
parent0ac8fce3591b1a72231c83827811aacd43121089 (diff)
downloadchromium_src-84610ad991df4481b9ecb9baaeef09d9131beaa4.zip
chromium_src-84610ad991df4481b9ecb9baaeef09d9131beaa4.tar.gz
chromium_src-84610ad991df4481b9ecb9baaeef09d9131beaa4.tar.bz2
Turn on parallel webkit tests for debug mode.
I've run 9 debug runs on my dual core Windows box and 14 debug runs on my quad core Mac. These three were the only tests that failed. I'm not sure what else I can do other than to try enabling them for the bots. Review URL: http://codereview.chromium.org/67021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13479 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/layout_tests/run_webkit_tests.py')
-rwxr-xr-xwebkit/tools/layout_tests/run_webkit_tests.py33
1 files changed, 14 insertions, 19 deletions
diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py
index 8b0af0e..31296cd 100755
--- a/webkit/tools/layout_tests/run_webkit_tests.py
+++ b/webkit/tools/layout_tests/run_webkit_tests.py
@@ -815,25 +815,20 @@ def main(options, args):
platform_new_results_dir = options.platform
if not options.num_test_shells:
- # Only run stable configurations with multiple test_shells by default.
- if options.target == 'Release':
- cpus = 1
- if sys.platform in ('win32', 'cygwin'):
- cpus = int(os.environ.get('NUMBER_OF_PROCESSORS', 1))
- elif (hasattr(os, "sysconf") and
- os.sysconf_names.has_key("SC_NPROCESSORS_ONLN")):
- # Linux & Unix:
- ncpus = os.sysconf("SC_NPROCESSORS_ONLN")
- if isinstance(ncpus, int) and ncpus > 0:
- cpus = ncpus
- elif sys.platform in ('darwin'): # OSX:
- cpus = int(os.popen2("sysctl -n hw.ncpu")[1].read())
-
- # TODO(ojan): Use cpus+1 once we flesh out the flakiness.
- options.num_test_shells = cpus
-
- else:
- options.num_test_shells = 1
+ cpus = 1
+ if sys.platform in ('win32', 'cygwin'):
+ cpus = int(os.environ.get('NUMBER_OF_PROCESSORS', 1))
+ elif (hasattr(os, "sysconf") and
+ os.sysconf_names.has_key("SC_NPROCESSORS_ONLN")):
+ # Linux & Unix:
+ ncpus = os.sysconf("SC_NPROCESSORS_ONLN")
+ if isinstance(ncpus, int) and ncpus > 0:
+ cpus = ncpus
+ elif sys.platform in ('darwin'): # OSX:
+ cpus = int(os.popen2("sysctl -n hw.ncpu")[1].read())
+
+ # TODO(ojan): Use cpus+1 once we flesh out the flakiness.
+ options.num_test_shells = cpus
logging.info("Running %s test_shells in parallel" % options.num_test_shells)