Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright 2014 The Chromium Authors. All rights reserved. | 2 # Copyright 2014 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 json | 6 import json |
| 7 import os | 7 import os |
| 8 import sys | 8 import sys |
| 9 | 9 |
| 10 | 10 |
| 11 import common | 11 import common |
| 12 | 12 |
| 13 | 13 |
| 14 def main_run(args): | 14 def main_run(args): |
| 15 filter_tests = [] | |
| 16 if args.filter_file: | |
| 17 filter_tests = json.load(args.filter_file) | |
| 18 | |
| 15 with common.temporary_file() as tempfile_path: | 19 with common.temporary_file() as tempfile_path: |
| 16 rc = common.run_command([ | 20 rc = common.run_command([ |
| 17 os.path.join(common.SRC_DIR, 'buildtools', 'checkdeps', 'checkdeps.py'), | 21 sys.executable, |
|
Sergiy Byelozyorov
2014/10/30 11:39:59
Why was nacl_intergration.py running checkdeps bef
Paweł Hajdan Jr.
2014/10/30 16:17:36
Please see e.g. unified diff https://codereview.ch
Sergiy Byelozyorov
2014/10/31 14:09:20
Acknowledged.
| |
| 18 '--json', tempfile_path | 22 os.path.join(common.SRC_DIR, 'chrome', 'test', 'nacl_test_injection', |
| 19 ]) | 23 'buildbot_nacl_integration.py'), |
| 24 '--mode', args.build_config_fs, | |
| 25 '--json_build_results_output_file', tempfile_path, | |
| 26 ] + filter_tests) | |
| 20 | 27 |
| 21 with open(tempfile_path) as f: | 28 with open(tempfile_path) as f: |
| 22 checkdeps_results = json.load(f) | 29 results = json.load(f) |
| 23 | 30 |
| 24 result_set = set() | |
| 25 for result in checkdeps_results: | |
| 26 for violation in result['violations']: | |
| 27 result_set.add((result['dependee_path'], violation['include_path'])) | |
| 28 | 31 |
| 29 json.dump({ | 32 json.dump({ |
| 30 'valid': True, | 33 'valid': True, |
| 31 'failures': ['%s: %s' % (r[0], r[1]) for r in result_set], | 34 'failures': [f['raw_name'] for f in results], |
| 32 }, args.output) | 35 }, args.output) |
| 33 | 36 |
| 34 return rc | 37 return rc |
| 35 | 38 |
| 36 | 39 |
| 37 def main_compile_targets(args): | 40 def main_compile_targets(args): |
| 38 json.dump([], args.output) | 41 json.dump(['chrome'], args.output) |
| 39 | 42 |
| 40 | 43 |
| 41 if __name__ == '__main__': | 44 if __name__ == '__main__': |
| 42 funcs = { | 45 funcs = { |
| 43 'run': main_run, | 46 'run': main_run, |
| 44 'compile_targets': main_compile_targets, | 47 'compile_targets': main_compile_targets, |
| 45 } | 48 } |
| 46 sys.exit(common.run_script(sys.argv[1:], funcs)) | 49 sys.exit(common.run_script(sys.argv[1:], funcs)) |
| OLD | NEW |