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 | 5 |
6 import logging | 6 import logging |
7 import re | 7 import re |
8 import os | 8 import os |
9 | 9 |
10 import constants | 10 import constants |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 external_storage + '/paks/resources.pak') | 126 external_storage + '/paks/resources.pak') |
127 self.adb.PushIfNeeded( | 127 self.adb.PushIfNeeded( |
128 self.test_suite_dirname + '/chrome_100_percent.pak', | 128 self.test_suite_dirname + '/chrome_100_percent.pak', |
129 external_storage + '/paks/chrome_100_percent.pak') | 129 external_storage + '/paks/chrome_100_percent.pak') |
130 self.adb.PushIfNeeded(self.test_suite_dirname + '/test_data', | 130 self.adb.PushIfNeeded(self.test_suite_dirname + '/test_data', |
131 external_storage + '/test_data') | 131 external_storage + '/test_data') |
132 if self.test_suite_basename == 'content_unittests': | 132 if self.test_suite_basename == 'content_unittests': |
133 self.adb.PushIfNeeded( | 133 self.adb.PushIfNeeded( |
134 self.test_suite_dirname + '/content_resources.pak', | 134 self.test_suite_dirname + '/content_resources.pak', |
135 external_storage + '/paks/content_resources.pak') | 135 external_storage + '/paks/content_resources.pak') |
| 136 if self.test_suite_basename == 'breakpad_unittests': |
| 137 self.adb.PushIfNeeded( |
| 138 self.test_suite_dirname + '/linux_dumper_unittest_helper', |
| 139 constants.TEST_EXECUTABLE_DIR + '/linux_dumper_unittest_helper') |
136 | 140 |
137 def _WatchTestOutput(self, p): | 141 def _WatchTestOutput(self, p): |
138 """Watches the test output. | 142 """Watches the test output. |
139 Args: | 143 Args: |
140 p: the process generating output as created by pexpect.spawn. | 144 p: the process generating output as created by pexpect.spawn. |
141 """ | 145 """ |
142 ok_tests = [] | 146 ok_tests = [] |
143 failed_tests = [] | 147 failed_tests = [] |
144 crashed_tests = [] | 148 crashed_tests = [] |
145 timed_out = False | 149 timed_out = False |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
193 if ret_code: | 197 if ret_code: |
194 failed_tests += [BaseTestResult('gtest exit code: %d' % ret_code, | 198 failed_tests += [BaseTestResult('gtest exit code: %d' % ret_code, |
195 'pexpect.before: %s' | 199 'pexpect.before: %s' |
196 '\npexpect.after: %s' | 200 '\npexpect.after: %s' |
197 % (p.before, | 201 % (p.before, |
198 p.after))] | 202 p.after))] |
199 # Create TestResults and return | 203 # Create TestResults and return |
200 return TestResults.FromRun(ok=ok_tests, failed=failed_tests, | 204 return TestResults.FromRun(ok=ok_tests, failed=failed_tests, |
201 crashed=crashed_tests, timed_out=timed_out, | 205 crashed=crashed_tests, timed_out=timed_out, |
202 overall_fail=overall_fail) | 206 overall_fail=overall_fail) |
OLD | NEW |