| 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 optparse | 9 import optparse |
| 10 import os | 10 import os |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 for test in INSTRUMENTATION_TESTS.itervalues(): | 176 for test in INSTRUMENTATION_TESTS.itervalues(): |
| 177 RunInstrumentationSuite(options, test) | 177 RunInstrumentationSuite(options, test) |
| 178 if 'webkit' in options.test_filter: | 178 if 'webkit' in options.test_filter: |
| 179 RunTestSuites(options, 'webkit_unit_tests') | 179 RunTestSuites(options, 'webkit_unit_tests') |
| 180 RunTestSuites(options, 'TestWebKitAPI') | 180 RunTestSuites(options, 'TestWebKitAPI') |
| 181 RunWebkitLint(options.target) | 181 RunWebkitLint(options.target) |
| 182 if 'webkit_layout' in options.test_filter: | 182 if 'webkit_layout' in options.test_filter: |
| 183 RunWebkitLayoutTests(options) | 183 RunWebkitLayoutTests(options) |
| 184 | 184 |
| 185 if options.experimental: | 185 if options.experimental: |
| 186 pass | 186 RunTestSuites(options, 'sandbox_linux_unittests') |
| 187 | 187 |
| 188 # Print logcat, kill logcat monitor | 188 # Print logcat, kill logcat monitor |
| 189 buildbot_report.PrintNamedStep('Logcat dump') | 189 buildbot_report.PrintNamedStep('Logcat dump') |
| 190 RunCmd(['build/android/adb_logcat_printer.py', logcat_dir]) | 190 RunCmd(['build/android/adb_logcat_printer.py', logcat_dir]) |
| 191 | 191 |
| 192 buildbot_report.PrintNamedStep('Test report') | 192 buildbot_report.PrintNamedStep('Test report') |
| 193 for report in glob.glob( | 193 for report in glob.glob( |
| 194 os.path.join(CHROME_SRC, 'out', options.target, 'test_logs', '*.log')): | 194 os.path.join(CHROME_SRC, 'out', options.target, 'test_logs', '*.log')): |
| 195 subprocess.Popen(['cat', report]).wait() | 195 subprocess.Popen(['cat', report]).wait() |
| 196 os.remove(report) | 196 os.remove(report) |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 235 if unknown_tests: | 235 if unknown_tests: |
| 236 return ParserError('Unknown tests %s' % list(unknown_tests)) | 236 return ParserError('Unknown tests %s' % list(unknown_tests)) |
| 237 | 237 |
| 238 setattr(options, 'target', options.factory_properties.get('target', 'Debug')) | 238 setattr(options, 'target', options.factory_properties.get('target', 'Debug')) |
| 239 | 239 |
| 240 MainTestWrapper(options) | 240 MainTestWrapper(options) |
| 241 | 241 |
| 242 | 242 |
| 243 if __name__ == '__main__': | 243 if __name__ == '__main__': |
| 244 sys.exit(main(sys.argv)) | 244 sys.exit(main(sys.argv)) |
| OLD | NEW |