summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-01 18:13:33 +0000
committerojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-01 18:13:33 +0000
commit15092cdf644ea3fe116b3a4309426b4da2471ebd (patch)
treea45dcc5ef6e5e2b035855003923a86f8c3a151c2 /webkit
parentd837a98189b9667532b479a772c899297b479a90 (diff)
downloadchromium_src-15092cdf644ea3fe116b3a4309426b4da2471ebd.zip
chromium_src-15092cdf644ea3fe116b3a4309426b4da2471ebd.tar.gz
chromium_src-15092cdf644ea3fe116b3a4309426b4da2471ebd.tar.bz2
Making rushed build fixes are a bad idea! My
last tbr included changes I didn't mean to. TBR again. Review URL: http://codereview.chromium.org/56157 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12962 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rwxr-xr-xwebkit/tools/layout_tests/run_webkit_tests.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py
index ec3f5e8..7cb990b 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'):
+ if sys.platform in ('win32', 'cygwin') and options.target == 'Release':
cpus = 1
if sys.platform in ('win32', 'cygwin'):
cpus = int(os.environ.get('NUMBER_OF_PROCESSORS', 1))
@@ -705,7 +705,6 @@ def main(options, args):
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: