OLD | NEW |
1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 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 """Script that is used by PRESUBMIT.py to run style checks on Java files.""" | 5 """Script that is used by PRESUBMIT.py to run style checks on Java files.""" |
6 | 6 |
7 import os | 7 import os |
8 import subprocess | 8 import subprocess |
9 import xml.dom.minidom | 9 import xml.dom.minidom |
10 | 10 |
11 | 11 |
12 CHROMIUM_SRC = os.path.normpath( | 12 CHROMIUM_SRC = os.path.normpath( |
13 os.path.join(os.path.dirname(__file__), | 13 os.path.join(os.path.dirname(__file__), |
14 os.pardir, os.pardir, os.pardir)) | 14 os.pardir, os.pardir, os.pardir)) |
15 CHECKSTYLE_ROOT = os.path.join(CHROMIUM_SRC, 'third_party', 'checkstyle', | 15 CHECKSTYLE_ROOT = os.path.join(CHROMIUM_SRC, 'third_party', 'checkstyle', |
16 'checkstyle-6.1-all.jar') | 16 'checkstyle-6.5-all.jar') |
17 | 17 |
18 | 18 |
19 def RunCheckstyle(input_api, output_api, style_file, black_list=None): | 19 def RunCheckstyle(input_api, output_api, style_file, black_list=None): |
20 if not os.path.exists(style_file): | 20 if not os.path.exists(style_file): |
21 file_error = (' Java checkstyle configuration file is missing: ' | 21 file_error = (' Java checkstyle configuration file is missing: ' |
22 + style_file) | 22 + style_file) |
23 return [output_api.PresubmitError(file_error)] | 23 return [output_api.PresubmitError(file_error)] |
24 | 24 |
25 # Filter out non-Java files and files that were deleted. | 25 # Filter out non-Java files and files that were deleted. |
26 java_files = [x.AbsoluteLocalPath() for x in input_api.AffectedSourceFiles( | 26 java_files = [x.AbsoluteLocalPath() for x in input_api.AffectedSourceFiles( |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 result_errors.append(result) | 68 result_errors.append(result) |
69 elif severity == 'warning': | 69 elif severity == 'warning': |
70 result_warnings.append(result) | 70 result_warnings.append(result) |
71 | 71 |
72 result = [] | 72 result = [] |
73 if result_warnings: | 73 if result_warnings: |
74 result.append(output_api.PresubmitPromptWarning('\n'.join(result_warnings))) | 74 result.append(output_api.PresubmitPromptWarning('\n'.join(result_warnings))) |
75 if result_errors: | 75 if result_errors: |
76 result.append(output_api.PresubmitError('\n'.join(result_errors))) | 76 result.append(output_api.PresubmitError('\n'.join(result_errors))) |
77 return result | 77 return result |
OLD | NEW |