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 import pexpect | 9 import pexpect |
10 | 10 |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
112 self.test_suite_dirname + '/chrome.pak', | 112 self.test_suite_dirname + '/chrome.pak', |
113 '/data/local/tmp/paks/chrome.pak') | 113 '/data/local/tmp/paks/chrome.pak') |
114 self.adb.PushIfNeeded( | 114 self.adb.PushIfNeeded( |
115 self.test_suite_dirname + '/locales/en-US.pak', | 115 self.test_suite_dirname + '/locales/en-US.pak', |
116 '/data/local/tmp/paks/en-US.pak') | 116 '/data/local/tmp/paks/en-US.pak') |
117 if self.test_suite_basename == 'unit_tests': | 117 if self.test_suite_basename == 'unit_tests': |
118 self.adb.PushIfNeeded( | 118 self.adb.PushIfNeeded( |
119 self.test_suite_dirname + '/resources.pak', | 119 self.test_suite_dirname + '/resources.pak', |
120 '/data/local/tmp/paks/resources.pak') | 120 '/data/local/tmp/paks/resources.pak') |
121 self.adb.PushIfNeeded( | 121 self.adb.PushIfNeeded( |
122 self.test_suite_dirname + '/theme_resources_100_percent.pak', | 122 self.test_suite_dirname + '/chrome_100_percent.pak', |
123 '/data/local/tmp/paks/theme_resources_100_percent.pak') | 123 '/data/local/tmp/paks/chrome_100_percent.pak') |
124 self.adb.PushIfNeeded( | |
125 self.test_suite_dirname + '/ui_resources_100_percent.pak', | |
126 '/data/local/tmp/paks/ui_resources_100_percent.pak') | |
127 self.adb.PushIfNeeded(self.test_suite_dirname + '/test_data', | 124 self.adb.PushIfNeeded(self.test_suite_dirname + '/test_data', |
128 '/data/local/tmp/test_data') | 125 '/data/local/tmp/test_data') |
129 if self.test_suite_basename == 'content_unittests': | 126 if self.test_suite_basename == 'content_unittests': |
130 self.adb.PushIfNeeded( | 127 self.adb.PushIfNeeded( |
131 self.test_suite_dirname + '/content_resources.pak', | 128 self.test_suite_dirname + '/content_resources.pak', |
132 '/data/local/tmp/paks/content_resources.pak') | 129 '/data/local/tmp/paks/content_resources.pak') |
133 | 130 |
134 def _WatchTestOutput(self, p): | 131 def _WatchTestOutput(self, p): |
135 """Watches the test output. | 132 """Watches the test output. |
136 Args: | 133 Args: |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
193 if ret_code: | 190 if ret_code: |
194 failed_tests += [BaseTestResult('gtest exit code: %d' % ret_code, | 191 failed_tests += [BaseTestResult('gtest exit code: %d' % ret_code, |
195 'pexpect.before: %s' | 192 'pexpect.before: %s' |
196 '\npexpect.after: %s' | 193 '\npexpect.after: %s' |
197 % (p.before, | 194 % (p.before, |
198 p.after))] | 195 p.after))] |
199 # Create TestResults and return | 196 # Create TestResults and return |
200 return TestResults.FromRun(ok=ok_tests, failed=failed_tests, | 197 return TestResults.FromRun(ok=ok_tests, failed=failed_tests, |
201 crashed=crashed_tests, timed_out=timed_out, | 198 crashed=crashed_tests, timed_out=timed_out, |
202 overall_fail=overall_fail) | 199 overall_fail=overall_fail) |
OLD | NEW |