| 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 import collections | 5 import collections |
| 6 import itertools | 6 import itertools |
| 7 import logging | 7 import logging |
| 8 import os | 8 import os |
| 9 import posixpath | 9 import posixpath |
| 10 | 10 |
| (...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 375 if self._test_instance.store_tombstones: | 375 if self._test_instance.store_tombstones: |
| 376 tombstones.ClearAllTombstones(device) | 376 tombstones.ClearAllTombstones(device) |
| 377 with device_temp_file.DeviceTempFile( | 377 with device_temp_file.DeviceTempFile( |
| 378 adb=device.adb, | 378 adb=device.adb, |
| 379 dir=self._delegate.ResultsDirectory(device), | 379 dir=self._delegate.ResultsDirectory(device), |
| 380 suffix='.xml') as device_tmp_results_file: | 380 suffix='.xml') as device_tmp_results_file: |
| 381 | 381 |
| 382 flags = self._test_instance.test_arguments or '' | 382 flags = self._test_instance.test_arguments or '' |
| 383 if self._test_instance.enable_xml_result_parsing: | 383 if self._test_instance.enable_xml_result_parsing: |
| 384 flags += ' --gtest_output=xml:%s' % device_tmp_results_file.name | 384 flags += ' --gtest_output=xml:%s' % device_tmp_results_file.name |
| 385 if self._test_instance.gtest_also_run_disabled_tests: |
| 386 flags += ' --gtest_also_run_disabled_tests' |
| 385 | 387 |
| 386 output = self._delegate.Run( | 388 output = self._delegate.Run( |
| 387 test, device, flags=flags, | 389 test, device, flags=flags, |
| 388 timeout=timeout, retries=0) | 390 timeout=timeout, retries=0) |
| 389 | 391 |
| 390 if self._test_instance.enable_xml_result_parsing: | 392 if self._test_instance.enable_xml_result_parsing: |
| 391 gtest_xml = device.ReadFile( | 393 gtest_xml = device.ReadFile( |
| 392 device_tmp_results_file.name, | 394 device_tmp_results_file.name, |
| 393 as_root=True) | 395 as_root=True) |
| 394 | 396 |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 428 def TearDown(self): | 430 def TearDown(self): |
| 429 @local_device_environment.handle_shard_failures | 431 @local_device_environment.handle_shard_failures |
| 430 def individual_device_tear_down(dev): | 432 def individual_device_tear_down(dev): |
| 431 for s in self._servers.get(str(dev), []): | 433 for s in self._servers.get(str(dev), []): |
| 432 s.TearDown() | 434 s.TearDown() |
| 433 | 435 |
| 434 tool = self.GetTool(dev) | 436 tool = self.GetTool(dev) |
| 435 tool.CleanUpEnvironment() | 437 tool.CleanUpEnvironment() |
| 436 | 438 |
| 437 self._env.parallel_devices.pMap(individual_device_tear_down) | 439 self._env.parallel_devices.pMap(individual_device_tear_down) |
| OLD | NEW |