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