| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # | 2 # |
| 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
| 6 | 6 |
| 7 """Runs both the Python and Java tests.""" | 7 """Runs both the Python and Java tests.""" |
| 8 | 8 |
| 9 import optparse | 9 import optparse |
| 10 import os | 10 import os |
| 11 import sys | 11 import sys |
| 12 import time | 12 import time |
| 13 | 13 |
| 14 from pylib import buildbot_report | 14 from pylib import buildbot_report |
| 15 from pylib import constants | 15 from pylib import constants |
| 16 from pylib import ports | 16 from pylib import ports |
| 17 from pylib.base.test_result import TestResults |
| 17 from pylib.host_driven import run_python_tests | 18 from pylib.host_driven import run_python_tests |
| 18 from pylib.instrumentation import apk_info | 19 from pylib.instrumentation import apk_info |
| 19 from pylib.instrumentation import run_java_tests | 20 from pylib.instrumentation import run_java_tests |
| 20 from pylib.test_result import TestResults | |
| 21 from pylib.utils import run_tests_helper | 21 from pylib.utils import run_tests_helper |
| 22 from pylib.utils import test_options_parser | 22 from pylib.utils import test_options_parser |
| 23 | 23 |
| 24 | 24 |
| 25 def DispatchInstrumentationTests(options): | 25 def DispatchInstrumentationTests(options): |
| 26 """Dispatches the Java and Python instrumentation tests, sharding if possible. | 26 """Dispatches the Java and Python instrumentation tests, sharding if possible. |
| 27 | 27 |
| 28 Uses the logging module to print the combined final results and | 28 Uses the logging module to print the combined final results and |
| 29 summary of the Java and Python tests. If the java_only option is set, only | 29 summary of the Java and Python tests. If the java_only option is set, only |
| 30 the Java tests run. If the python_only option is set, only the python tests | 30 the Java tests run. If the python_only option is set, only the python tests |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 ret = 1 | 76 ret = 1 |
| 77 try: | 77 try: |
| 78 ret = DispatchInstrumentationTests(options) | 78 ret = DispatchInstrumentationTests(options) |
| 79 finally: | 79 finally: |
| 80 buildbot_report.PrintStepResultIfNeeded(options, ret) | 80 buildbot_report.PrintStepResultIfNeeded(options, ret) |
| 81 return ret | 81 return ret |
| 82 | 82 |
| 83 | 83 |
| 84 if __name__ == '__main__': | 84 if __name__ == '__main__': |
| 85 sys.exit(main(sys.argv)) | 85 sys.exit(main(sys.argv)) |
| OLD | NEW |