| 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  | 
|  11  |  11  | 
|  12 def CommonChecks(input_api, output_api): |  12 def CommonChecks(input_api, output_api): | 
|  13   output = [] |  13   output = [] | 
|  14  |  14  | 
|  15   def J(*dirs): |  15   def J(*dirs): | 
|  16     """Returns a path relative to presubmit directory.""" |  16     """Returns a path relative to presubmit directory.""" | 
|  17     return input_api.os_path.join(input_api.PresubmitLocalPath(), *dirs) |  17     return input_api.os_path.join(input_api.PresubmitLocalPath(), *dirs) | 
|  18  |  18  | 
|  19   output.extend(input_api.canned_checks.RunPylint( |  19   output.extend(input_api.canned_checks.RunPylint( | 
|  20       input_api, |  20       input_api, | 
|  21       output_api, |  21       output_api, | 
|  22       black_list=[r'pylib/symbols/.*\.py$', r'gyp/.*\.py$', r'gn/.*\.py'], |  22       black_list=[r'pylib/symbols/.*\.py$', r'gyp/.*\.py$', r'gn/.*\.py'], | 
|  23       extra_paths_list=[ |  23       extra_paths_list=[J(), J('buildbot')])) | 
|  24           J(), J('..', '..', 'third_party', 'android_testrunner'), |  | 
|  25           J('buildbot')])) |  | 
|  26   output.extend(input_api.canned_checks.RunPylint( |  24   output.extend(input_api.canned_checks.RunPylint( | 
|  27       input_api, |  25       input_api, | 
|  28       output_api, |  26       output_api, | 
|  29       white_list=[r'gyp/.*\.py$', r'gn/.*\.py'], |  27       white_list=[r'gyp/.*\.py$', r'gn/.*\.py'], | 
|  30       extra_paths_list=[J('gyp'), J('gn')])) |  28       extra_paths_list=[J('gyp'), J('gn')])) | 
|  31  |  29  | 
|  32   # Disabled due to http://crbug.com/410936 |  30   # Disabled due to http://crbug.com/410936 | 
|  33   #output.extend(input_api.canned_checks.RunUnitTestsInDirectory( |  31   #output.extend(input_api.canned_checks.RunUnitTestsInDirectory( | 
|  34   #input_api, output_api, J('buildbot', 'tests'))) |  32   #input_api, output_api, J('buildbot', 'tests'))) | 
|  35  |  33  | 
| (...skipping 20 matching lines...) Expand all  Loading... | 
|  56       env=pylib_test_env)) |  54       env=pylib_test_env)) | 
|  57   return output |  55   return output | 
|  58  |  56  | 
|  59  |  57  | 
|  60 def CheckChangeOnUpload(input_api, output_api): |  58 def CheckChangeOnUpload(input_api, output_api): | 
|  61   return CommonChecks(input_api, output_api) |  59   return CommonChecks(input_api, output_api) | 
|  62  |  60  | 
|  63  |  61  | 
|  64 def CheckChangeOnCommit(input_api, output_api): |  62 def CheckChangeOnCommit(input_api, output_api): | 
|  65   return CommonChecks(input_api, output_api) |  63   return CommonChecks(input_api, output_api) | 
| OLD | NEW |