| 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 DEPS = [ | 5 DEPS = [ |
| 6 'chromium', | 6 'chromium', |
| 7 'gclient', | 7 'gclient', |
| 8 'itertools', | 8 'itertools', |
| 9 'json', | 9 'json', |
| 10 'path', | 10 'path', |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 def run(self, suffix): | 110 def run(self, suffix): |
| 111 def followup_fn(step_result): | 111 def followup_fn(step_result): |
| 112 r = step_result.json.gtest_results | 112 r = step_result.json.gtest_results |
| 113 p = step_result.presentation | 113 p = step_result.presentation |
| 114 | 114 |
| 115 if r.valid: | 115 if r.valid: |
| 116 p.step_text += api.test_utils.format_step_text([ | 116 p.step_text += api.test_utils.format_step_text([ |
| 117 ['failures:', r.failures] | 117 ['failures:', r.failures] |
| 118 ]) | 118 ]) |
| 119 | 119 |
| 120 args = [api.json.gtest_results()] | 120 args = [api.json.gtest_results(add_json_log=False)] |
| 121 | 121 |
| 122 if suffix == 'without patch': | 122 if suffix == 'without patch': |
| 123 args.append(api.chromium.test_launcher_filter( | 123 args.append(api.chromium.test_launcher_filter( |
| 124 self.failures('with patch'))) | 124 self.failures('with patch'))) |
| 125 | 125 |
| 126 return api.chromium.runtests(self.name, | 126 return api.chromium.runtests(self.name, |
| 127 args, | 127 args, |
| 128 xvfb=True, | 128 xvfb=True, |
| 129 name=self._step_name(suffix), | 129 name=self._step_name(suffix), |
| 130 parallel=True, | 130 parallel=True, |
| (...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 386 api.json.output(None)) | 386 api.json.output(None)) |
| 387 yield invalid_json_without_patch_test | 387 yield invalid_json_without_patch_test |
| 388 | 388 |
| 389 for step in ('gclient revert', 'gclient runhooks', 'compile'): | 389 for step in ('gclient revert', 'gclient runhooks', 'compile'): |
| 390 yield ( | 390 yield ( |
| 391 api.test(step.replace(' ', '_') + '_failure') + | 391 api.test(step.replace(' ', '_') + '_failure') + |
| 392 props() + | 392 props() + |
| 393 api.platform.name('win') + | 393 api.platform.name('win') + |
| 394 api.step_data(step, retcode=1) | 394 api.step_data(step, retcode=1) |
| 395 ) | 395 ) |
| OLD | NEW |