Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(430)

Side by Side Diff: scripts/master/factory/chromium_factory.py

Issue 3750002: Add timeout for safebrowsing test. (Closed) Base URL: svn://chrome-svn/chrome/trunk/tools/buildbot/
Patch Set: '' Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/python 1 #!/usr/bin/python
2 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 """Utility class to build the chromium master BuildFactory's. 6 """Utility class to build the chromium master BuildFactory's.
7 7
8 Based on gclient_factory.py and adds chromium-specific steps.""" 8 Based on gclient_factory.py and adds chromium-specific steps."""
9 9
10 import os 10 import os
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 if R('googleurl'): f.AddBasicGTestTestStep('googleurl_unittests', fp) 179 if R('googleurl'): f.AddBasicGTestTestStep('googleurl_unittests', fp)
180 if R('gpu'): f.AddBasicGTestTestStep( 180 if R('gpu'): f.AddBasicGTestTestStep(
181 'gpu_unittests', fp, 181 'gpu_unittests', fp,
182 arg_list=['--gmock_verbose=error']) 182 arg_list=['--gmock_verbose=error'])
183 if R('media'): f.AddBasicGTestTestStep('media_unittests', fp) 183 if R('media'): f.AddBasicGTestTestStep('media_unittests', fp)
184 if R('net'): f.AddBasicGTestTestStep('net_unittests', fp) 184 if R('net'): f.AddBasicGTestTestStep('net_unittests', fp)
185 if R('plugin'): f.AddBasicGTestTestStep('plugin_tests', fp) 185 if R('plugin'): f.AddBasicGTestTestStep('plugin_tests', fp)
186 if R('printing'): f.AddBasicGTestTestStep('printing_unittests', fp) 186 if R('printing'): f.AddBasicGTestTestStep('printing_unittests', fp)
187 if R('remoting'): f.AddBasicGTestTestStep('remoting_unittests', fp) 187 if R('remoting'): f.AddBasicGTestTestStep('remoting_unittests', fp)
188 if R('test_shell'): f.AddBasicGTestTestStep('test_shell_tests', fp) 188 if R('test_shell'): f.AddBasicGTestTestStep('test_shell_tests', fp)
189 if R('safe_browsing'): f.AddBasicGTestTestStep('safe_browsing_tests', fp) 189 if R('safe_browsing'): f.AddBasicGTestTestStep(
190 'safe_browsing_tests', fp,
191 arg_list=['--test-terminate-timeout=40000'])
190 192
191 # Medium-sized tests (unit and browser): 193 # Medium-sized tests (unit and browser):
192 if R('unit'): f.AddChromeUnitTests(fp) 194 if R('unit'): f.AddChromeUnitTests(fp)
193 if R('browser_tests'): f.AddBasicGTestTestStep( 195 if R('browser_tests'): f.AddBasicGTestTestStep(
194 'browser_tests', fp, 196 'browser_tests', fp,
195 arg_list=['--lib=browser_tests']) 197 arg_list=['--lib=browser_tests'])
196 198
197 # Big, UI tests: 199 # Big, UI tests:
198 if R('ui'): f.AddUITests(False, fp) 200 if R('ui'): f.AddUITests(False, fp)
199 if R('ui-single'): f.AddUITests(True, fp) 201 if R('ui-single'): f.AddUITests(True, fp)
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 self._target_platform) 530 self._target_platform)
529 chromium_cmd_obj.AddDownloadAndExtractOfficialBuild(identifier) 531 chromium_cmd_obj.AddDownloadAndExtractOfficialBuild(identifier)
530 532
531 # crash_service.exe doesn't fire up on its own because we have the 533 # crash_service.exe doesn't fire up on its own because we have the
532 # binaries in chrome-win32 dir (not in the default src/chrome/Release). 534 # binaries in chrome-win32 dir (not in the default src/chrome/Release).
533 # Fire it by force. 535 # Fire it by force.
534 if self._target_platform == 'win32': 536 if self._target_platform == 'win32':
535 chromium_cmd_obj.AddRunCrashHandler(build_dir='chrome-win32', target='.') 537 chromium_cmd_obj.AddRunCrashHandler(build_dir='chrome-win32', target='.')
536 self._AddTests(chromium_cmd_obj, tests, mode, factory_properties) 538 self._AddTests(chromium_cmd_obj, tests, mode, factory_properties)
537 return factory 539 return factory
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698