| 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 from slave import recipe_api | 5 from slave import recipe_api |
| 6 from slave import recipe_util | 6 from slave import recipe_util |
| 7 | 7 |
| 8 from .util import GTestResults, TestResults | 8 from .util import GTestResults, TestResults |
| 9 | 9 |
| 10 from RECIPE_MODULES.json.api import JsonOutputPlaceholder | 10 # TODO(luqui): Destroy this DEPS hack. |
| 11 import DEPS |
| 12 JsonOutputPlaceholder = DEPS['json'].api.JsonOutputPlaceholder |
| 11 | 13 |
| 12 class TestResultsOutputPlaceholder(JsonOutputPlaceholder): | 14 class TestResultsOutputPlaceholder(JsonOutputPlaceholder): |
| 13 def result(self, presentation, test): | 15 def result(self, presentation, test): |
| 14 ret = super(TestResultsOutputPlaceholder, self).result(presentation, test) | 16 ret = super(TestResultsOutputPlaceholder, self).result(presentation, test) |
| 15 return TestResults(ret) | 17 return TestResults(ret) |
| 16 | 18 |
| 17 | 19 |
| 18 # TODO(martiniss) replace this with step.AggregateResults once | 20 # TODO(martiniss) replace this with step.AggregateResults once |
| 19 # aggregate steps lands | 21 # aggregate steps lands |
| 20 class GTestResultsOutputPlaceholder(JsonOutputPlaceholder): | 22 class GTestResultsOutputPlaceholder(JsonOutputPlaceholder): |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 188 """A placeholder which will expand to | 190 """A placeholder which will expand to |
| 189 '--test-launcher-summary-output=/tmp/file'. | 191 '--test-launcher-summary-output=/tmp/file'. |
| 190 | 192 |
| 191 Provides the --test-launcher-summary-output flag since --flag=value | 193 Provides the --test-launcher-summary-output flag since --flag=value |
| 192 (i.e. a single token in the command line) is the required format. | 194 (i.e. a single token in the command line) is the required format. |
| 193 | 195 |
| 194 The test_results will be an instance of the GTestResults class. | 196 The test_results will be an instance of the GTestResults class. |
| 195 """ | 197 """ |
| 196 return GTestResultsOutputPlaceholder(self, add_json_log) | 198 return GTestResultsOutputPlaceholder(self, add_json_log) |
| 197 | 199 |
| OLD | NEW |