| 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 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 return [ | 189 return [ |
| 190 'content/test/data/gpu/webgl_conformance_test_expectations.txt', | 190 'content/test/data/gpu/webgl_conformance_test_expectations.txt', |
| 191 'net/data/ssl/certificates/', | 191 'net/data/ssl/certificates/', |
| 192 'webkit/data/dom_storage/webcore_test_database.localstorage', | 192 'webkit/data/dom_storage/webcore_test_database.localstorage', |
| 193 'third_party/hyphen/hyph_en_US.dic', | 193 'third_party/hyphen/hyph_en_US.dic', |
| 194 ] | 194 ] |
| 195 elif self.test_package.test_suite_basename == 'media_unittests': | 195 elif self.test_package.test_suite_basename == 'media_unittests': |
| 196 return [ | 196 return [ |
| 197 'media/test/data', | 197 'media/test/data', |
| 198 ] | 198 ] |
| 199 elif self.test_package.test_suite_basename == 'cc_perftests': |
| 200 return [ |
| 201 'cc/test/data', |
| 202 ] |
| 199 return [] | 203 return [] |
| 200 | 204 |
| 201 def LaunchHelperToolsForTestSuite(self): | 205 def LaunchHelperToolsForTestSuite(self): |
| 202 """Launches helper tools for the test suite. | 206 """Launches helper tools for the test suite. |
| 203 | 207 |
| 204 Sometimes one test may need to run some helper tools first in order to | 208 Sometimes one test may need to run some helper tools first in order to |
| 205 successfully complete the test. | 209 successfully complete the test. |
| 206 """ | 210 """ |
| 207 if self._TestSuiteRequiresMockTestServer(): | 211 if self._TestSuiteRequiresMockTestServer(): |
| 208 self.LaunchChromeTestServerSpawner() | 212 self.LaunchChromeTestServerSpawner() |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 276 def TearDown(self): | 280 def TearDown(self): |
| 277 """Cleans up the test enviroment for the test suite.""" | 281 """Cleans up the test enviroment for the test suite.""" |
| 278 self.tool.CleanUpEnvironment() | 282 self.tool.CleanUpEnvironment() |
| 279 if self.test_package.cleanup_test_files: | 283 if self.test_package.cleanup_test_files: |
| 280 self.adb.RemovePushedFiles() | 284 self.adb.RemovePushedFiles() |
| 281 if self.dump_debug_info: | 285 if self.dump_debug_info: |
| 282 self.dump_debug_info.StopRecordingLog() | 286 self.dump_debug_info.StopRecordingLog() |
| 283 if self.dump_debug_info: | 287 if self.dump_debug_info: |
| 284 self.dump_debug_info.ArchiveNewCrashFiles() | 288 self.dump_debug_info.ArchiveNewCrashFiles() |
| 285 super(SingleTestRunner, self).TearDown() | 289 super(SingleTestRunner, self).TearDown() |
| OLD | NEW |