Chromium Code Reviews| 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 import contextlib | 5 import contextlib |
| 6 import datetime | 6 import datetime |
| 7 import json | 7 import json |
| 8 import os | 8 import os |
| 9 import re | 9 import re |
| 10 import sys | 10 import sys |
| (...skipping 1057 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1068 if extra_src: | 1068 if extra_src: |
| 1069 args = args + ['--extra_src', extra_src] | 1069 args = args + ['--extra_src', extra_src] |
| 1070 if path_to_config: | 1070 if path_to_config: |
| 1071 args = args + ['--path_to_config', path_to_config] | 1071 args = args + ['--path_to_config', path_to_config] |
| 1072 self.m.step('run bisect perf regression', | 1072 self.m.step('run bisect perf regression', |
| 1073 [self.m.path['checkout'].join('tools', | 1073 [self.m.path['checkout'].join('tools', |
| 1074 'run-bisect-perf-regression.py'), | 1074 'run-bisect-perf-regression.py'), |
| 1075 '-w', self.m.path['slave_build']] + args, **kwargs) | 1075 '-w', self.m.path['slave_build']] + args, **kwargs) |
| 1076 | 1076 |
| 1077 def run_test_suite(self, suite, verbose=True, isolate_file_path=None, | 1077 def run_test_suite(self, suite, verbose=True, isolate_file_path=None, |
| 1078 gtest_filter=None, tool=None, flakiness_dashboard=None, | 1078 gtest_filter=None, tool=None, |
|
ghost stip (do not use)
2016/08/15 18:25:17
can you make sure this doesn't break internally
jbudorick
2016/08/15 18:27:44
Already did.
| |
| 1079 name=None, json_results_file=None, shard_timeout=None, | 1079 name=None, json_results_file=None, shard_timeout=None, |
| 1080 args=None, **kwargs): | 1080 args=None, **kwargs): |
| 1081 args = args or [] | 1081 args = args or [] |
| 1082 args.extend(['--blacklist-file', self.blacklist_file]) | 1082 args.extend(['--blacklist-file', self.blacklist_file]) |
| 1083 if verbose: | 1083 if verbose: |
| 1084 args.append('--verbose') | 1084 args.append('--verbose') |
| 1085 # TODO(agrieve): Remove once no more tests pass isolate_file_path (contained | 1085 # TODO(agrieve): Remove once no more tests pass isolate_file_path (contained |
| 1086 # in wrapper scripts). | 1086 # in wrapper scripts). |
| 1087 if isolate_file_path: | 1087 if isolate_file_path: |
| 1088 args.append('--isolate_file_path=%s' % isolate_file_path) | 1088 args.append('--isolate_file_path=%s' % isolate_file_path) |
| 1089 if gtest_filter: | 1089 if gtest_filter: |
| 1090 args.append('--gtest_filter=%s' % gtest_filter) | 1090 args.append('--gtest_filter=%s' % gtest_filter) |
| 1091 if tool: | 1091 if tool: |
| 1092 args.append('--tool=%s' % tool) | 1092 args.append('--tool=%s' % tool) |
| 1093 if flakiness_dashboard: | |
| 1094 args.append('--flakiness-dashboard-server=%s' % | |
| 1095 flakiness_dashboard) | |
| 1096 if json_results_file: | 1093 if json_results_file: |
| 1097 args.extend(['--json-results-file', json_results_file]) | 1094 args.extend(['--json-results-file', json_results_file]) |
| 1098 # TODO(agrieve): Remove once no more tests pass shard_timeout (contained in | 1095 # TODO(agrieve): Remove once no more tests pass shard_timeout (contained in |
| 1099 # wrapper scripts). | 1096 # wrapper scripts). |
| 1100 if shard_timeout: | 1097 if shard_timeout: |
| 1101 args.extend(['-t', str(shard_timeout)]) | 1098 args.extend(['-t', str(shard_timeout)]) |
| 1102 self.test_runner( | 1099 self.test_runner( |
| 1103 name or str(suite), | 1100 name or str(suite), |
| 1104 args=args, | 1101 args=args, |
| 1105 wrapper_script_suite_name=suite, | 1102 wrapper_script_suite_name=suite, |
| (...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1471 script = self.c.test_runner | 1468 script = self.c.test_runner |
| 1472 if wrapper_script_suite_name: | 1469 if wrapper_script_suite_name: |
| 1473 script = self.m.chromium.output_dir.join('bin', 'run_%s' % | 1470 script = self.m.chromium.output_dir.join('bin', 'run_%s' % |
| 1474 wrapper_script_suite_name) | 1471 wrapper_script_suite_name) |
| 1475 else: | 1472 else: |
| 1476 env = kwargs.get('env', {}) | 1473 env = kwargs.get('env', {}) |
| 1477 env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR', | 1474 env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR', |
| 1478 self.m.chromium.output_dir) | 1475 self.m.chromium.output_dir) |
| 1479 kwargs['env'] = env | 1476 kwargs['env'] = env |
| 1480 return self.m.python(step_name, script, args, **kwargs) | 1477 return self.m.python(step_name, script, args, **kwargs) |
| OLD | NEW |