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 import glob | 5 import glob |
6 import logging | 6 import logging |
7 import os | 7 import os |
8 import sys | 8 import sys |
9 | 9 |
10 from pylib import android_commands | 10 from pylib import android_commands |
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
183 'net/data/proxy_resolver_v8_unittest', | 183 'net/data/proxy_resolver_v8_unittest', |
184 'net/data/ssl/certificates', | 184 'net/data/ssl/certificates', |
185 'net/data/url_request_unittest/', | 185 'net/data/url_request_unittest/', |
186 'net/data/proxy_script_fetcher_unittest' | 186 'net/data/proxy_script_fetcher_unittest' |
187 ] | 187 ] |
188 elif self.test_package.test_suite_basename == 'ui_tests': | 188 elif self.test_package.test_suite_basename == 'ui_tests': |
189 return [ | 189 return [ |
190 'chrome/test/data/dromaeo', | 190 'chrome/test/data/dromaeo', |
191 'chrome/test/data/json2.js', | 191 'chrome/test/data/json2.js', |
192 'chrome/test/data/sunspider', | 192 'chrome/test/data/sunspider', |
193 'chrome/test/data/v8_benchmark', | |
194 'chrome/test/perf/v8_benchmark_uitest.js', | |
195 ] | 193 ] |
196 elif self.test_package.test_suite_basename == 'content_unittests': | 194 elif self.test_package.test_suite_basename == 'content_unittests': |
197 return [ | 195 return [ |
198 'content/test/data/gpu/webgl_conformance_test_expectations.txt', | 196 'content/test/data/gpu/webgl_conformance_test_expectations.txt', |
199 'net/data/ssl/certificates/', | 197 'net/data/ssl/certificates/', |
200 'webkit/data/dom_storage/webcore_test_database.localstorage', | 198 'webkit/data/dom_storage/webcore_test_database.localstorage', |
201 'third_party/hyphen/hyph_en_US.dic', | 199 'third_party/hyphen/hyph_en_US.dic', |
202 ] | 200 ] |
203 elif self.test_package.test_suite_basename == 'media_unittests': | 201 elif self.test_package.test_suite_basename == 'media_unittests': |
204 return [ | 202 return [ |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
284 def TearDown(self): | 282 def TearDown(self): |
285 """Cleans up the test enviroment for the test suite.""" | 283 """Cleans up the test enviroment for the test suite.""" |
286 self.tool.CleanUpEnvironment() | 284 self.tool.CleanUpEnvironment() |
287 if self.test_package.cleanup_test_files: | 285 if self.test_package.cleanup_test_files: |
288 self.adb.RemovePushedFiles() | 286 self.adb.RemovePushedFiles() |
289 if self.dump_debug_info: | 287 if self.dump_debug_info: |
290 self.dump_debug_info.StopRecordingLog() | 288 self.dump_debug_info.StopRecordingLog() |
291 if self.dump_debug_info: | 289 if self.dump_debug_info: |
292 self.dump_debug_info.ArchiveNewCrashFiles() | 290 self.dump_debug_info.ArchiveNewCrashFiles() |
293 super(SingleTestRunner, self).TearDown() | 291 super(SingleTestRunner, self).TearDown() |
OLD | NEW |