Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(195)

Side by Side Diff: build/android/pylib/single_test_runner.py

Issue 10800036: Android: Push data file needed by HypenatorTest to the device. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « build/android/gtest_filter/content_unittests_disabled ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 return data 219 return data
220 elif self.test_package.test_suite_basename == 'webkit_unit_tests': 220 elif self.test_package.test_suite_basename == 'webkit_unit_tests':
221 return [ 221 return [
222 'third_party/WebKit/Source/WebKit/chromium/tests/data', 222 'third_party/WebKit/Source/WebKit/chromium/tests/data',
223 ] 223 ]
224 elif self.test_package.test_suite_basename == 'content_unittests': 224 elif self.test_package.test_suite_basename == 'content_unittests':
225 return [ 225 return [
226 'chrome/test/gpu/webgl_conformance_test_expectations.txt', 226 'chrome/test/gpu/webgl_conformance_test_expectations.txt',
227 'net/data/ssl/certificates/', 227 'net/data/ssl/certificates/',
228 'webkit/data/dom_storage/webcore_test_database.localstorage', 228 'webkit/data/dom_storage/webcore_test_database.localstorage',
229 'third_party/hyphen/hyph_en_US.dic',
229 ] 230 ]
230 elif self.test_package.test_suite_basename == 'media_unittests': 231 elif self.test_package.test_suite_basename == 'media_unittests':
231 return [ 232 return [
232 'media/test/data', 233 'media/test/data',
233 ] 234 ]
234 return [] 235 return []
235 236
236 def LaunchHelperToolsForTestSuite(self): 237 def LaunchHelperToolsForTestSuite(self):
237 """Launches helper tools for the test suite. 238 """Launches helper tools for the test suite.
238 239
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 self.tool.CleanUpEnvironment() 334 self.tool.CleanUpEnvironment()
334 if self.test_package.cleanup_test_files: 335 if self.test_package.cleanup_test_files:
335 self.adb.RemovePushedFiles() 336 self.adb.RemovePushedFiles()
336 if self.dump_debug_info: 337 if self.dump_debug_info:
337 self.dump_debug_info.StopRecordingLog() 338 self.dump_debug_info.StopRecordingLog()
338 if self.test_package.performance_test: 339 if self.test_package.performance_test:
339 self.adb.TearDownPerformanceTest() 340 self.adb.TearDownPerformanceTest()
340 if self.dump_debug_info: 341 if self.dump_debug_info:
341 self.dump_debug_info.ArchiveNewCrashFiles() 342 self.dump_debug_info.ArchiveNewCrashFiles()
342 super(SingleTestRunner, self).TearDown() 343 super(SingleTestRunner, self).TearDown()
OLDNEW
« no previous file with comments | « build/android/gtest_filter/content_unittests_disabled ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698