OLD | NEW |
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 """Class for running instrumentation tests on a single device.""" | 5 """Class for running instrumentation tests on a single device.""" |
6 | 6 |
7 import logging | 7 import logging |
8 import os | 8 import os |
9 import re | 9 import re |
10 import time | 10 import time |
11 | 11 |
12 from pylib import android_commands | 12 from pylib import android_commands |
13 from pylib import constants | 13 from pylib import constants |
14 from pylib import flag_changer | 14 from pylib import flag_changer |
15 from pylib import json_perf_parser | |
16 from pylib import perf_tests_helper | 15 from pylib import perf_tests_helper |
17 from pylib import valgrind_tools | 16 from pylib import valgrind_tools |
18 from pylib.base import base_test_result | 17 from pylib.base import base_test_result |
19 from pylib.base import base_test_runner | 18 from pylib.base import base_test_runner |
| 19 from pylib.instrumentation import json_perf_parser |
20 | 20 |
21 import test_result | 21 import test_result |
22 | 22 |
23 | 23 |
24 _PERF_TEST_ANNOTATION = 'PerfTest' | 24 _PERF_TEST_ANNOTATION = 'PerfTest' |
25 | 25 |
26 | 26 |
27 def _GetDataFilesForTestSuite(suite_basename): | 27 def _GetDataFilesForTestSuite(suite_basename): |
28 """Returns a list of data files/dirs needed by the test suite. | 28 """Returns a list of data files/dirs needed by the test suite. |
29 | 29 |
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
366 duration_ms = 0 | 366 duration_ms = 0 |
367 message = str(e) | 367 message = str(e) |
368 if not message: | 368 if not message: |
369 message = 'No information.' | 369 message = 'No information.' |
370 results.AddResult(test_result.InstrumentationTestResult( | 370 results.AddResult(test_result.InstrumentationTestResult( |
371 test, base_test_result.ResultType.CRASH, start_date_ms, duration_ms, | 371 test, base_test_result.ResultType.CRASH, start_date_ms, duration_ms, |
372 log=message)) | 372 log=message)) |
373 raw_result = None | 373 raw_result = None |
374 self.TestTeardown(test, raw_result) | 374 self.TestTeardown(test, raw_result) |
375 return (results, None if results.DidRunPass() else test) | 375 return (results, None if results.DidRunPass() else test) |
OLD | NEW |