| 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.recipe_modules.webrtc import builders | 6 from slave.recipe_modules.webrtc import builders |
| 7 | 7 |
| 8 | 8 |
| 9 class WebRTCApi(recipe_api.RecipeApi): | 9 class WebRTCApi(recipe_api.RecipeApi): |
| 10 def __init__(self, **kwargs): | 10 def __init__(self, **kwargs): |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 self.m.chromium.runtest( | 207 self.m.chromium.runtest( |
| 208 test=test, args=args, name=name, | 208 test=test, args=args, name=name, |
| 209 results_url=self.DASHBOARD_UPLOAD_URL, annotate='graphing', | 209 results_url=self.DASHBOARD_UPLOAD_URL, annotate='graphing', |
| 210 xvfb=True, perf_dashboard_id=perf_dashboard_id, test_type=test, | 210 xvfb=True, perf_dashboard_id=perf_dashboard_id, test_type=test, |
| 211 env=env, revision=revision, perf_id=self.c.PERF_ID, | 211 env=env, revision=revision, perf_id=self.c.PERF_ID, |
| 212 perf_config=self.c.PERF_CONFIG) | 212 perf_config=self.c.PERF_CONFIG) |
| 213 else: | 213 else: |
| 214 annotate = 'gtest' | 214 annotate = 'gtest' |
| 215 python_mode = False | 215 python_mode = False |
| 216 test_type = test | 216 test_type = test |
| 217 flakiness_dash = not self.m.tryserver.is_tryserver | 217 flakiness_dash = (not self.m.tryserver.is_tryserver and |
| 218 not self.m.chromium.c.runtests.memory_tool) |
| 218 if parallel: | 219 if parallel: |
| 219 test_executable = self.m.chromium.c.build_dir.join( | 220 test_executable = self.m.chromium.c.build_dir.join( |
| 220 self.m.chromium.c.build_config_fs, test) | 221 self.m.chromium.c.build_config_fs, test) |
| 221 args = [test_executable] + args | 222 args = [test_executable] + args |
| 222 test = self.m.path['checkout'].join('third_party', 'gtest-parallel', | 223 test = self.m.path['checkout'].join('third_party', 'gtest-parallel', |
| 223 'gtest-parallel') | 224 'gtest-parallel') |
| 224 python_mode = True | 225 python_mode = True |
| 225 annotate = None # The parallel script doesn't output gtest format. | 226 annotate = None # The parallel script doesn't output gtest format. |
| 226 flakiness_dash = False | 227 flakiness_dash = False |
| 227 | 228 |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 292 if self.m.chromium.c.TARGET_PLATFORM == 'android': | 293 if self.m.chromium.c.TARGET_PLATFORM == 'android': |
| 293 self.m.chromium_android.clean_local_files() | 294 self.m.chromium_android.clean_local_files() |
| 294 else: | 295 else: |
| 295 self.m.chromium.cleanup_temp() | 296 self.m.chromium.cleanup_temp() |
| 296 | 297 |
| 297 def virtual_webcam_check(self): | 298 def virtual_webcam_check(self): |
| 298 self.m.python( | 299 self.m.python( |
| 299 'webcam_check', | 300 'webcam_check', |
| 300 self.m.path['build'].join('scripts', 'slave', 'webrtc', | 301 self.m.path['build'].join('scripts', 'slave', 'webrtc', |
| 301 'ensure_webcam_is_running.py')) | 302 'ensure_webcam_is_running.py')) |
| OLD | NEW |