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 base_test_runner import BaseTestRunner | 10 from base_test_runner import BaseTestRunner |
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
220 'net/data/ssl/certificates', | 220 'net/data/ssl/certificates', |
221 'net/data/url_request_unittest/', | 221 'net/data/url_request_unittest/', |
222 'net/data/proxy_script_fetcher_unittest' | 222 'net/data/proxy_script_fetcher_unittest' |
223 ] | 223 ] |
224 elif self.test_package.test_suite_basename == 'ui_tests': | 224 elif self.test_package.test_suite_basename == 'ui_tests': |
225 return [ | 225 return [ |
226 'chrome/test/data/dromaeo', | 226 'chrome/test/data/dromaeo', |
227 'chrome/test/data/json2.js', | 227 'chrome/test/data/json2.js', |
228 'chrome/test/data/sunspider', | 228 'chrome/test/data/sunspider', |
229 'chrome/test/data/v8_benchmark', | 229 'chrome/test/data/v8_benchmark', |
230 'chrome/test/perf/sunspider_uitest.js', | |
231 'chrome/test/perf/v8_benchmark_uitest.js', | 230 'chrome/test/perf/v8_benchmark_uitest.js', |
232 ] | 231 ] |
233 elif self.test_package.test_suite_basename == 'content_unittests': | 232 elif self.test_package.test_suite_basename == 'content_unittests': |
234 return [ | 233 return [ |
235 'content/test/data/gpu/webgl_conformance_test_expectations.txt', | 234 'content/test/data/gpu/webgl_conformance_test_expectations.txt', |
236 'net/data/ssl/certificates/', | 235 'net/data/ssl/certificates/', |
237 'webkit/data/dom_storage/webcore_test_database.localstorage', | 236 'webkit/data/dom_storage/webcore_test_database.localstorage', |
238 'third_party/hyphen/hyph_en_US.dic', | 237 'third_party/hyphen/hyph_en_US.dic', |
239 ] | 238 ] |
240 elif self.test_package.test_suite_basename == 'media_unittests': | 239 elif self.test_package.test_suite_basename == 'media_unittests': |
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
367 self.tool.CleanUpEnvironment() | 366 self.tool.CleanUpEnvironment() |
368 if self.test_package.cleanup_test_files: | 367 if self.test_package.cleanup_test_files: |
369 self.adb.RemovePushedFiles() | 368 self.adb.RemovePushedFiles() |
370 if self.dump_debug_info: | 369 if self.dump_debug_info: |
371 self.dump_debug_info.StopRecordingLog() | 370 self.dump_debug_info.StopRecordingLog() |
372 if self._performance_test_setup: | 371 if self._performance_test_setup: |
373 self._performance_test_setup.TearDown() | 372 self._performance_test_setup.TearDown() |
374 if self.dump_debug_info: | 373 if self.dump_debug_info: |
375 self.dump_debug_info.ArchiveNewCrashFiles() | 374 self.dump_debug_info.ArchiveNewCrashFiles() |
376 super(SingleTestRunner, self).TearDown() | 375 super(SingleTestRunner, self).TearDown() |
OLD | NEW |