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 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 for d in data: | 223 for d in data: |
224 if not os.path.exists(d): | 224 if not os.path.exists(d): |
225 raise Exception('Page cycler data not found.') | 225 raise Exception('Page cycler data not found.') |
226 return data | 226 return data |
227 elif self.test_package.test_suite_basename == 'webkit_unit_tests': | 227 elif self.test_package.test_suite_basename == 'webkit_unit_tests': |
228 return [ | 228 return [ |
229 'third_party/WebKit/Source/WebKit/chromium/tests/data', | 229 'third_party/WebKit/Source/WebKit/chromium/tests/data', |
230 ] | 230 ] |
231 elif self.test_package.test_suite_basename == 'content_unittests': | 231 elif self.test_package.test_suite_basename == 'content_unittests': |
232 return [ | 232 return [ |
233 'chrome/test/gpu/webgl_conformance_test_expectations.txt', | 233 'content/test/data/gpu/webgl_conformance_test_expectations.txt', |
234 'net/data/ssl/certificates/', | 234 'net/data/ssl/certificates/', |
235 'webkit/data/dom_storage/webcore_test_database.localstorage', | 235 'webkit/data/dom_storage/webcore_test_database.localstorage', |
236 'third_party/hyphen/hyph_en_US.dic', | 236 'third_party/hyphen/hyph_en_US.dic', |
237 ] | 237 ] |
238 elif self.test_package.test_suite_basename == 'media_unittests': | 238 elif self.test_package.test_suite_basename == 'media_unittests': |
239 return [ | 239 return [ |
240 'media/test/data', | 240 'media/test/data', |
241 ] | 241 ] |
242 return [] | 242 return [] |
243 | 243 |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
334 self.tool.CleanUpEnvironment() | 334 self.tool.CleanUpEnvironment() |
335 if self.test_package.cleanup_test_files: | 335 if self.test_package.cleanup_test_files: |
336 self.adb.RemovePushedFiles() | 336 self.adb.RemovePushedFiles() |
337 if self.dump_debug_info: | 337 if self.dump_debug_info: |
338 self.dump_debug_info.StopRecordingLog() | 338 self.dump_debug_info.StopRecordingLog() |
339 if self._performance_test_setup: | 339 if self._performance_test_setup: |
340 self._performance_test_setup.TearDown() | 340 self._performance_test_setup.TearDown() |
341 if self.dump_debug_info: | 341 if self.dump_debug_info: |
342 self.dump_debug_info.ArchiveNewCrashFiles() | 342 self.dump_debug_info.ArchiveNewCrashFiles() |
343 super(SingleTestRunner, self).TearDown() | 343 super(SingleTestRunner, self).TearDown() |
OLD | NEW |