| 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 recipe_engine.types import freeze | 5 from recipe_engine.types import freeze |
| 6 from recipe_engine import recipe_api | 6 from recipe_engine import recipe_api |
| 7 from . import builders | 7 from . import builders |
| 8 from . import steps | 8 from . import steps |
| 9 | 9 |
| 10 | 10 |
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 270 test=test, args=args, name=name, | 270 test=test, args=args, name=name, |
| 271 results_url=self.DASHBOARD_UPLOAD_URL, annotate='graphing', | 271 results_url=self.DASHBOARD_UPLOAD_URL, annotate='graphing', |
| 272 xvfb=True, perf_dashboard_id=perf_dashboard_id, | 272 xvfb=True, perf_dashboard_id=perf_dashboard_id, |
| 273 test_type=perf_dashboard_id, env=env, python_mode=python_mode, | 273 test_type=perf_dashboard_id, env=env, python_mode=python_mode, |
| 274 revision=self.revision_number, perf_id=self.c.PERF_ID, | 274 revision=self.revision_number, perf_id=self.c.PERF_ID, |
| 275 perf_config=self.c.PERF_CONFIG) | 275 perf_config=self.c.PERF_CONFIG) |
| 276 else: | 276 else: |
| 277 annotate = 'gtest' | 277 annotate = 'gtest' |
| 278 test_type = test | 278 test_type = test |
| 279 flakiness_dash = (not self.m.tryserver.is_tryserver and | 279 flakiness_dash = (not self.m.tryserver.is_tryserver and |
| 280 not self.m.chromium.c.runtests.memory_tool) | 280 not self.m.chromium.c.runtests.enable_memcheck) |
| 281 | 281 |
| 282 # Dr Memory and Memcheck memory tools uses special scripts that doesn't | 282 # Memcheck uses special scripts that don't play well with |
| 283 # play well with the gtest-parallel script. | 283 # the gtest-parallel script. |
| 284 if parallel and not self.m.chromium.c.runtests.memory_tool: | 284 if parallel and not self.m.chromium.c.runtests.enable_memcheck: |
| 285 test_executable = self.m.chromium.c.build_dir.join( | 285 test_executable = self.m.chromium.c.build_dir.join( |
| 286 self.m.chromium.c.build_config_fs, test) | 286 self.m.chromium.c.build_config_fs, test) |
| 287 args = [test_executable, '--'] + args | 287 args = [test_executable, '--'] + args |
| 288 test = self.m.path['checkout'].join('third_party', 'gtest-parallel', | 288 test = self.m.path['checkout'].join('third_party', 'gtest-parallel', |
| 289 'gtest-parallel') | 289 'gtest-parallel') |
| 290 python_mode = True | 290 python_mode = True |
| 291 annotate = None # The parallel script doesn't output gtest format. | 291 annotate = None # The parallel script doesn't output gtest format. |
| 292 flakiness_dash = False | 292 flakiness_dash = False |
| 293 | 293 |
| 294 self.m.chromium.runtest( | 294 self.m.chromium.runtest( |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 367 def clean_test_output(self): | 367 def clean_test_output(self): |
| 368 """Remove all test output in out/, since we have tests leaking files.""" | 368 """Remove all test output in out/, since we have tests leaking files.""" |
| 369 out_dir = self.m.path['checkout'].join('out') | 369 out_dir = self.m.path['checkout'].join('out') |
| 370 self.m.python('clean test output files', | 370 self.m.python('clean test output files', |
| 371 script=self.resource('cleanup_files.py'), | 371 script=self.resource('cleanup_files.py'), |
| 372 args=[out_dir], | 372 args=[out_dir], |
| 373 infra_step=True) | 373 infra_step=True) |
| 374 | 374 |
| 375 def virtual_webcam_check(self): | 375 def virtual_webcam_check(self): |
| 376 self.m.python('webcam_check', self.resource('ensure_webcam_is_running.py')) | 376 self.m.python('webcam_check', self.resource('ensure_webcam_is_running.py')) |
| OLD | NEW |