diff options
| author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-01 18:11:10 +0000 |
|---|---|---|
| committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-01 18:11:10 +0000 |
| commit | d837a98189b9667532b479a772c899297b479a90 (patch) | |
| tree | 08af9b5ab229fc5a979e6e9918cb3b67ed4a4ffa | |
| parent | 6b15ede1d7af4984fe62b0a94d49d04d6e79d4df (diff) | |
| download | chromium_src-d837a98189b9667532b479a772c899297b479a90.zip chromium_src-d837a98189b9667532b479a772c899297b479a90.tar.gz chromium_src-d837a98189b9667532b479a772c899297b479a90.tar.bz2 | |
Doh. Fix type error. TBR.
Review URL: http://codereview.chromium.org/58006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12961 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | webkit/tools/layout_tests/run_webkit_tests.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py index bed6587..ec3f5e8 100755 --- a/webkit/tools/layout_tests/run_webkit_tests.py +++ b/webkit/tools/layout_tests/run_webkit_tests.py @@ -681,7 +681,7 @@ def main(options, args): if not options.num_test_shells: # For now, only run Windows-Release in parallel until we make other # configurations more stable. - if sys.platform in ('win32', 'cygwin') and options.target == 'Release': + if sys.platform in ('win32', 'cygwin'): cpus = 1 if sys.platform in ('win32', 'cygwin'): cpus = int(os.environ.get('NUMBER_OF_PROCESSORS', 1)) @@ -700,11 +700,12 @@ def main(options, args): # Some HTTP tests start timing out when tests are run in parallel. # TODO(ojan): Impelement per-test-timeouts instead. http://crbug.com/9613 if not options.time_out_ms: - options.time_out_ms = 20000 + options.time_out_ms = '20000' else: options.num_test_shells = 1 + print str(options.num_test_shells) + '|' + str(options.time_out_ms) # Include all tests if none are specified. paths = args if not paths: |