| 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 | 8 | 
| 9 from pylib import android_commands | 9 from pylib import android_commands | 
| 10 from pylib import constants | 10 from pylib import constants | 
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 99         'chrome/test/data/dromaeo', | 99         'chrome/test/data/dromaeo', | 
| 100         'chrome/test/data/json2.js', | 100         'chrome/test/data/json2.js', | 
| 101         'chrome/test/data/sunspider', | 101         'chrome/test/data/sunspider', | 
| 102         ] | 102         ] | 
| 103   elif test_suite_basename == 'ui_unittests': | 103   elif test_suite_basename == 'ui_unittests': | 
| 104     return [ | 104     return [ | 
| 105         'ui/base/test/data/data_pack_unittest/truncated-header.pak', | 105         'ui/base/test/data/data_pack_unittest/truncated-header.pak', | 
| 106     ] | 106     ] | 
| 107   elif test_suite_basename == 'content_unittests': | 107   elif test_suite_basename == 'content_unittests': | 
| 108     return [ | 108     return [ | 
| 109         'content/browser/gpu/gpu_driver_bug_list.json', |  | 
| 110         'content/browser/gpu/gpu_switching_list.json', |  | 
| 111         'content/browser/gpu/software_rendering_list.json', |  | 
| 112         'content/test/data/gpu/webgl_conformance_test_expectations.txt', | 109         'content/test/data/gpu/webgl_conformance_test_expectations.txt', | 
| 113         'net/data/ssl/certificates/', | 110         'net/data/ssl/certificates/', | 
| 114         'third_party/hyphen/hyph_en_US.dic', | 111         'third_party/hyphen/hyph_en_US.dic', | 
| 115         'webkit/data/dom_storage/webcore_test_database.localstorage', | 112         'webkit/data/dom_storage/webcore_test_database.localstorage', | 
| 116         ] | 113         ] | 
| 117   elif test_suite_basename == 'cc_perftests': | 114   elif test_suite_basename == 'cc_perftests': | 
| 118     return [ | 115     return [ | 
| 119       'cc/test/data', | 116       'cc/test/data', | 
| 120     ] | 117     ] | 
| 121   elif test_suite_basename == 'perf_tests': | 118   elif test_suite_basename == 'perf_tests': | 
| (...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 380       self.LaunchChromeTestServerSpawner() | 377       self.LaunchChromeTestServerSpawner() | 
| 381     self.tool.SetupEnvironment() | 378     self.tool.SetupEnvironment() | 
| 382 | 379 | 
| 383   #override | 380   #override | 
| 384   def TearDown(self): | 381   def TearDown(self): | 
| 385     """Cleans up the test enviroment for the test suite.""" | 382     """Cleans up the test enviroment for the test suite.""" | 
| 386     self.tool.CleanUpEnvironment() | 383     self.tool.CleanUpEnvironment() | 
| 387     if self._cleanup_test_files: | 384     if self._cleanup_test_files: | 
| 388       self.adb.RemovePushedFiles() | 385       self.adb.RemovePushedFiles() | 
| 389     super(TestRunner, self).TearDown() | 386     super(TestRunner, self).TearDown() | 
| OLD | NEW | 
|---|