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 flags += ' --gtest_also_run_disabled_tests' | |
shenghuazhang
2016/12/01 00:39:56
I think this line is somehow necessary. When run g
jbudorick
2016/12/01 00:44:48
My point was just that we shouldn't add it all the
shenghuazhang
2016/12/01 00:57:32
KK I see :p
| |
385 | 386 |
386 output = self._delegate.Run( | 387 output = self._delegate.Run( |
387 test, device, flags=flags, | 388 test, device, flags=flags, |
388 timeout=timeout, retries=0) | 389 timeout=timeout, retries=0) |
389 | 390 |
390 if self._test_instance.enable_xml_result_parsing: | 391 if self._test_instance.enable_xml_result_parsing: |
391 gtest_xml = device.ReadFile( | 392 gtest_xml = device.ReadFile( |
392 device_tmp_results_file.name, | 393 device_tmp_results_file.name, |
393 as_root=True) | 394 as_root=True) |
394 | 395 |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
428 def TearDown(self): | 429 def TearDown(self): |
429 @local_device_environment.handle_shard_failures | 430 @local_device_environment.handle_shard_failures |
430 def individual_device_tear_down(dev): | 431 def individual_device_tear_down(dev): |
431 for s in self._servers.get(str(dev), []): | 432 for s in self._servers.get(str(dev), []): |
432 s.TearDown() | 433 s.TearDown() |
433 | 434 |
434 tool = self.GetTool(dev) | 435 tool = self.GetTool(dev) |
435 tool.CleanUpEnvironment() | 436 tool.CleanUpEnvironment() |
436 | 437 |
437 self._env.parallel_devices.pMap(individual_device_tear_down) | 438 self._env.parallel_devices.pMap(individual_device_tear_down) |
OLD | NEW |