OLD | NEW |
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 """Presubmit script for android buildbot. | 5 """Presubmit script for android buildbot. |
6 | 6 |
7 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts for | 7 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts for |
8 details on the presubmit API built into depot_tools. | 8 details on the presubmit API built into depot_tools. |
9 """ | 9 """ |
10 | 10 |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 pylib_test_env = dict(input_api.environ) | 55 pylib_test_env = dict(input_api.environ) |
56 pylib_test_env.update({ | 56 pylib_test_env.update({ |
57 'PYTHONPATH': input_api.PresubmitLocalPath(), | 57 'PYTHONPATH': input_api.PresubmitLocalPath(), |
58 'PYTHONDONTWRITEBYTECODE': '1', | 58 'PYTHONDONTWRITEBYTECODE': '1', |
59 }) | 59 }) |
60 output.extend(input_api.canned_checks.RunUnitTests( | 60 output.extend(input_api.canned_checks.RunUnitTests( |
61 input_api, | 61 input_api, |
62 output_api, | 62 output_api, |
63 unit_tests=[ | 63 unit_tests=[ |
64 J('pylib', 'device', 'device_utils_test.py'), | 64 J('pylib', 'device', 'device_utils_test.py'), |
| 65 J('pylib', 'device', 'logcat_monitor_test.py'), |
65 J('pylib', 'gtest', 'gtest_test_instance_test.py'), | 66 J('pylib', 'gtest', 'gtest_test_instance_test.py'), |
66 J('pylib', 'instrumentation', | 67 J('pylib', 'instrumentation', |
67 'instrumentation_test_instance_test.py'), | 68 'instrumentation_test_instance_test.py'), |
68 J('pylib', 'results', 'json_results_test.py'), | 69 J('pylib', 'results', 'json_results_test.py'), |
69 J('pylib', 'utils', 'md5sum_test.py'), | 70 J('pylib', 'utils', 'md5sum_test.py'), |
70 ], | 71 ], |
71 env=pylib_test_env)) | 72 env=pylib_test_env)) |
72 # TODO(jbudorick): Reenable this check once upstreaming is finished. | 73 # TODO(jbudorick): Reenable this check once upstreaming is finished. |
73 # output.extend(_CheckDeletionsOnlyFiles(input_api, output_api)) | 74 # output.extend(_CheckDeletionsOnlyFiles(input_api, output_api)) |
74 return output | 75 return output |
75 | 76 |
76 | 77 |
77 def CheckChangeOnUpload(input_api, output_api): | 78 def CheckChangeOnUpload(input_api, output_api): |
78 return CommonChecks(input_api, output_api) | 79 return CommonChecks(input_api, output_api) |
79 | 80 |
80 | 81 |
81 def CheckChangeOnCommit(input_api, output_api): | 82 def CheckChangeOnCommit(input_api, output_api): |
82 return CommonChecks(input_api, output_api) | 83 return CommonChecks(input_api, output_api) |
OLD | NEW |