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 if parallel: | 218 if parallel: |
218 test_executable = self.m.chromium.c.build_dir.join( | 219 test_executable = self.m.chromium.c.build_dir.join( |
219 self.m.chromium.c.build_config_fs, test) | 220 self.m.chromium.c.build_config_fs, test) |
220 args = [test_executable] + args | 221 args = [test_executable] + args |
221 test = self.m.path['checkout'].join('third_party', 'gtest-parallel', | 222 test = self.m.path['checkout'].join('third_party', 'gtest-parallel', |
222 'gtest-parallel') | 223 'gtest-parallel') |
223 python_mode = True | 224 python_mode = True |
224 annotate = None # The parallel script doesn't output gtest format. | 225 annotate = None # The parallel script doesn't output gtest format. |
| 226 flakiness_dash = False |
225 | 227 |
226 self.m.chromium.runtest( | 228 self.m.chromium.runtest( |
227 test=test, args=args, name=name, annotate=annotate, xvfb=True, | 229 test=test, args=args, name=name, annotate=annotate, xvfb=True, |
228 python_mode=python_mode, test_type=test_type, env=env) | 230 flakiness_dash=flakiness_dash, python_mode=python_mode, |
| 231 test_type=test_type, env=env) |
229 | 232 |
230 def test_runner(self, test, isolate_path): | 233 def test_runner(self, test, isolate_path): |
231 """Adds a test to run on Android devices. | 234 """Adds a test to run on Android devices. |
232 | 235 |
233 This is a minimal version for WebRTC, similar to the methods in the | 236 This is a minimal version for WebRTC, similar to the methods in the |
234 chromium_android recipe module. It's needed since we need to alter the | 237 chromium_android recipe module. It's needed since we need to alter the |
235 environment. | 238 environment. |
236 """ | 239 """ |
237 script = self.m.path['checkout'].join('build', 'android', 'test_runner.py') | 240 script = self.m.path['checkout'].join('build', 'android', 'test_runner.py') |
238 args = ['gtest', '-s', test, '--verbose', '--isolate-file-path', | 241 args = ['gtest', '-s', test, '--verbose', '--isolate-file-path', |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
289 if self.m.chromium.c.TARGET_PLATFORM == 'android': | 292 if self.m.chromium.c.TARGET_PLATFORM == 'android': |
290 self.m.chromium_android.clean_local_files() | 293 self.m.chromium_android.clean_local_files() |
291 else: | 294 else: |
292 self.m.chromium.cleanup_temp() | 295 self.m.chromium.cleanup_temp() |
293 | 296 |
294 def virtual_webcam_check(self): | 297 def virtual_webcam_check(self): |
295 self.m.python( | 298 self.m.python( |
296 'webcam_check', | 299 'webcam_check', |
297 self.m.path['build'].join('scripts', 'slave', 'webrtc', | 300 self.m.path['build'].join('scripts', 'slave', 'webrtc', |
298 'ensure_webcam_is_running.py')) | 301 'ensure_webcam_is_running.py')) |
OLD | NEW |