| 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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 """Returns a list of data files/dirs needed by the test suite.""" | 142 """Returns a list of data files/dirs needed by the test suite.""" |
| 143 # Ideally, we'd just push all test data. However, it has >100MB, and a lot | 143 # Ideally, we'd just push all test data. However, it has >100MB, and a lot |
| 144 # of the files are not relevant (some are used for browser_tests, others for | 144 # of the files are not relevant (some are used for browser_tests, others for |
| 145 # features not supported, etc..). | 145 # features not supported, etc..). |
| 146 if self.test_package.test_suite_basename in ['base_unittests', | 146 if self.test_package.test_suite_basename in ['base_unittests', |
| 147 'sql_unittests', | 147 'sql_unittests', |
| 148 'unit_tests']: | 148 'unit_tests']: |
| 149 test_files = [ | 149 test_files = [ |
| 150 'base/data/file_util_unittest', | 150 'base/data/file_util_unittest', |
| 151 'base/data/json/bom_feff.json', | 151 'base/data/json/bom_feff.json', |
| 152 'chrome/browser/resources/software_rendering_list.json', | |
| 153 'chrome/test/data/download-test1.lib', | 152 'chrome/test/data/download-test1.lib', |
| 154 'chrome/test/data/extensions/bad_magic.crx', | 153 'chrome/test/data/extensions/bad_magic.crx', |
| 155 'chrome/test/data/extensions/good.crx', | 154 'chrome/test/data/extensions/good.crx', |
| 156 'chrome/test/data/extensions/icon1.png', | 155 'chrome/test/data/extensions/icon1.png', |
| 157 'chrome/test/data/extensions/icon2.png', | 156 'chrome/test/data/extensions/icon2.png', |
| 158 'chrome/test/data/extensions/icon3.png', | 157 'chrome/test/data/extensions/icon3.png', |
| 159 'chrome/test/data/extensions/allow_silent_upgrade/', | 158 'chrome/test/data/extensions/allow_silent_upgrade/', |
| 160 'chrome/test/data/extensions/app/', | 159 'chrome/test/data/extensions/app/', |
| 161 'chrome/test/data/extensions/bad/', | 160 'chrome/test/data/extensions/bad/', |
| 162 'chrome/test/data/extensions/effective_host_permissions/', | 161 'chrome/test/data/extensions/effective_host_permissions/', |
| (...skipping 12 matching lines...) Expand all Loading... |
| 175 'chrome/test/data/pref_service/', | 174 'chrome/test/data/pref_service/', |
| 176 'chrome/test/data/serializer_nested_test.js', | 175 'chrome/test/data/serializer_nested_test.js', |
| 177 'chrome/test/data/serializer_test.js', | 176 'chrome/test/data/serializer_test.js', |
| 178 'chrome/test/data/serializer_test_nowhitespace.js', | 177 'chrome/test/data/serializer_test_nowhitespace.js', |
| 179 'chrome/test/data/top_sites/', | 178 'chrome/test/data/top_sites/', |
| 180 'chrome/test/data/web_app_info/', | 179 'chrome/test/data/web_app_info/', |
| 181 'chrome/test/data/web_database', | 180 'chrome/test/data/web_database', |
| 182 'chrome/test/data/webui/', | 181 'chrome/test/data/webui/', |
| 183 'chrome/test/data/zip', | 182 'chrome/test/data/zip', |
| 184 'chrome/third_party/mock4js/', | 183 'chrome/third_party/mock4js/', |
| 184 'content/browser/gpu/software_rendering_list.json', |
| 185 'net/data/cache_tests/insert_load1', | 185 'net/data/cache_tests/insert_load1', |
| 186 'net/data/cache_tests/dirty_entry5', | 186 'net/data/cache_tests/dirty_entry5', |
| 187 'net/data/ssl/certificates/', | 187 'net/data/ssl/certificates/', |
| 188 'ui/base/test/data/data_pack_unittest', | 188 'ui/base/test/data/data_pack_unittest', |
| 189 ] | 189 ] |
| 190 if self.test_package.test_suite_basename == 'unit_tests': | 190 if self.test_package.test_suite_basename == 'unit_tests': |
| 191 test_files += ['chrome/test/data/simple_open_search.xml'] | 191 test_files += ['chrome/test/data/simple_open_search.xml'] |
| 192 # The following are spell check data. Now only list the data under | 192 # The following are spell check data. Now only list the data under |
| 193 # third_party/hunspell_dictionaries which are used by unit tests. | 193 # third_party/hunspell_dictionaries which are used by unit tests. |
| 194 old_cwd = os.getcwd() | 194 old_cwd = os.getcwd() |
| (...skipping 139 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 |