| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2013 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 import collections | 6 import collections |
| 7 import glob | 7 import glob |
| 8 import json | 8 import json |
| 9 import multiprocessing | 9 import multiprocessing |
| 10 import optparse | 10 import optparse |
| (...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 284 RunChromeDriverTests() | 284 RunChromeDriverTests() |
| 285 if 'unit' in options.test_filter: | 285 if 'unit' in options.test_filter: |
| 286 RunTestSuites(options, gtest_config.STABLE_TEST_SUITES) | 286 RunTestSuites(options, gtest_config.STABLE_TEST_SUITES) |
| 287 RunBrowserTestSuite(options) | 287 RunBrowserTestSuite(options) |
| 288 if 'ui' in options.test_filter: | 288 if 'ui' in options.test_filter: |
| 289 for test in INSTRUMENTATION_TESTS.itervalues(): | 289 for test in INSTRUMENTATION_TESTS.itervalues(): |
| 290 RunInstrumentationSuite(options, test) | 290 RunInstrumentationSuite(options, test) |
| 291 if 'webkit' in options.test_filter: | 291 if 'webkit' in options.test_filter: |
| 292 RunTestSuites(options, [ | 292 RunTestSuites(options, [ |
| 293 gtest_config.Apk('webkit_unit_tests'), | 293 gtest_config.Apk('webkit_unit_tests'), |
| 294 gtest_config.Apk('TestWebKitAPI'), | |
| 295 ]) | 294 ]) |
| 296 RunWebkitLint(options.target) | 295 RunWebkitLint(options.target) |
| 297 if 'webkit_layout' in options.test_filter: | 296 if 'webkit_layout' in options.test_filter: |
| 298 RunWebkitLayoutTests(options) | 297 RunWebkitLayoutTests(options) |
| 299 | 298 |
| 300 if options.experimental: | 299 if options.experimental: |
| 301 RunTestSuites(options, gtest_config.EXPERIMENTAL_TEST_SUITES) | 300 RunTestSuites(options, gtest_config.EXPERIMENTAL_TEST_SUITES) |
| 302 | 301 |
| 303 # Print logcat, kill logcat monitor | 302 # Print logcat, kill logcat monitor |
| 304 buildbot_report.PrintNamedStep('logcat_dump') | 303 buildbot_report.PrintNamedStep('logcat_dump') |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 368 'slave', 'android')) | 367 'slave', 'android')) |
| 369 if os.path.exists(build_internal_android): | 368 if os.path.exists(build_internal_android): |
| 370 android_paths.insert(0, build_internal_android) | 369 android_paths.insert(0, build_internal_android) |
| 371 os.environ['PATH'] = os.pathsep.join(android_paths + [os.environ['PATH']]) | 370 os.environ['PATH'] = os.pathsep.join(android_paths + [os.environ['PATH']]) |
| 372 | 371 |
| 373 MainTestWrapper(options) | 372 MainTestWrapper(options) |
| 374 | 373 |
| 375 | 374 |
| 376 if __name__ == '__main__': | 375 if __name__ == '__main__': |
| 377 sys.exit(main(sys.argv)) | 376 sys.exit(main(sys.argv)) |
| OLD | NEW |