| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 recipe_engine import recipe_api | 5 from recipe_engine import recipe_api |
| 6 | 6 |
| 7 | 7 |
| 8 class IsolateApi(recipe_api.RecipeApi): | 8 class IsolateApi(recipe_api.RecipeApi): |
| 9 """APIs for interacting with isolates.""" | 9 """APIs for interacting with isolates.""" |
| 10 | 10 |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 236 self.m.chromium.runtest( | 236 self.m.chromium.runtest( |
| 237 self._run_isolated_path, | 237 self._run_isolated_path, |
| 238 args=self.runtest_args_list(test, args), | 238 args=self.runtest_args_list(test, args), |
| 239 # We must use the name of the test as the name in order to avoid | 239 # We must use the name of the test as the name in order to avoid |
| 240 # duplicate steps called "run_isolated". | 240 # duplicate steps called "run_isolated". |
| 241 name=name or test, | 241 name=name or test, |
| 242 revision=revision, | 242 revision=revision, |
| 243 webkit_revision=webkit_revision, | 243 webkit_revision=webkit_revision, |
| 244 **runtest_kwargs) | 244 **runtest_kwargs) |
| 245 | 245 |
| 246 def run_telemetry_test(self, isolate_name, test, revision, webkit_revision, | |
| 247 **runtest_kwargs): | |
| 248 """Runs a Telemetry test which has previously isolated to the server. | |
| 249 | |
| 250 Uses runtest_args_list, above, and delegates to | |
| 251 api.chromium.run_telemetry_test. | |
| 252 """ | |
| 253 self.m.chromium.run_telemetry_test( | |
| 254 self._run_isolated_path, | |
| 255 test, | |
| 256 # When running the Telemetry test via an isolate we need to tell | |
| 257 # run_isolated.py the hash and isolate server first, and then give | |
| 258 # the isolate the test name and other arguments separately. | |
| 259 prefix_args=self.runtest_args_list(isolate_name), | |
| 260 revision=revision, | |
| 261 webkit_revision=webkit_revision, | |
| 262 **runtest_kwargs) | |
| 263 | |
| 264 def remove_build_metadata(self): | 246 def remove_build_metadata(self): |
| 265 """Removes the build metadata embedded in the build artifacts.""" | 247 """Removes the build metadata embedded in the build artifacts.""" |
| 266 args = [ | 248 args = [ |
| 267 '--build-dir', self.m.chromium.output_dir, | 249 '--build-dir', self.m.chromium.output_dir, |
| 268 '--src-dir', self.m.path['checkout'] | 250 '--src-dir', self.m.path['checkout'] |
| 269 ] | 251 ] |
| 270 # Turn the failures during this step into warnings, it's a best effort step | 252 # Turn the failures during this step into warnings, it's a best effort step |
| 271 # that shouldn't break the build for now. | 253 # that shouldn't break the build for now. |
| 272 try: | 254 try: |
| 273 self.m.python('remove_build_metadata', | 255 self.m.python('remove_build_metadata', |
| 274 self.resource('remove_build_metadata.py'), | 256 self.resource('remove_build_metadata.py'), |
| 275 args=args, | 257 args=args, |
| 276 cwd=self.m.path['slave_build']) | 258 cwd=self.m.path['slave_build']) |
| 277 except self.m.step.StepFailure: | 259 except self.m.step.StepFailure: |
| 278 step_result = self.m.step.active_result | 260 step_result = self.m.step.active_result |
| 279 step_result.presentation.status = self.m.step.WARNING | 261 step_result.presentation.status = self.m.step.WARNING |
| 280 | 262 |
| 281 def compare_build_artifacts(self, first_dir, second_dir): | 263 def compare_build_artifacts(self, first_dir, second_dir): |
| 282 """Compare the artifacts from 2 builds.""" | 264 """Compare the artifacts from 2 builds.""" |
| 283 args = [ | 265 args = [ |
| 284 '--first-build-dir', first_dir, | 266 '--first-build-dir', first_dir, |
| 285 '--second-build-dir', second_dir, | 267 '--second-build-dir', second_dir, |
| 286 '--target-platform', self.m.chromium.c.TARGET_PLATFORM | 268 '--target-platform', self.m.chromium.c.TARGET_PLATFORM |
| 287 ] | 269 ] |
| 288 self.m.python('compare_build_artifacts', | 270 self.m.python('compare_build_artifacts', |
| 289 self.resource('compare_build_artifacts.py'), | 271 self.resource('compare_build_artifacts.py'), |
| 290 args=args, | 272 args=args, |
| 291 cwd=self.m.path['slave_build']) | 273 cwd=self.m.path['slave_build']) |
| OLD | NEW |