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

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

Issue 10793004: Add media_unittest test suite data files on Android. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Update the patch 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
« no previous file with comments | « no previous file | 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 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 ] 229 ]
230 elif self.test_package.test_suite_basename == 'media_unittests':
231 return [
232 'media/test/data',
233 ]
230 return [] 234 return []
231 235
232 def LaunchHelperToolsForTestSuite(self): 236 def LaunchHelperToolsForTestSuite(self):
233 """Launches helper tools for the test suite. 237 """Launches helper tools for the test suite.
234 238
235 Sometimes one test may need to run some helper tools first in order to 239 Sometimes one test may need to run some helper tools first in order to
236 successfully complete the test. 240 successfully complete the test.
237 """ 241 """
238 if self._TestSuiteRequiresMockTestServer(): 242 if self._TestSuiteRequiresMockTestServer():
239 self.LaunchChromeTestServerSpawner() 243 self.LaunchChromeTestServerSpawner()
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 def TearDown(self): 331 def TearDown(self):
328 """Cleans up the test enviroment for the test suite.""" 332 """Cleans up the test enviroment for the test suite."""
329 self.tool.CleanUpEnvironment() 333 self.tool.CleanUpEnvironment()
330 if self.test_package.cleanup_test_files: 334 if self.test_package.cleanup_test_files:
331 self.adb.RemovePushedFiles() 335 self.adb.RemovePushedFiles()
332 if self.dump_debug_info: 336 if self.dump_debug_info:
333 self.dump_debug_info.StopRecordingLog() 337 self.dump_debug_info.StopRecordingLog()
334 if self.test_package.performance_test: 338 if self.test_package.performance_test:
335 self.adb.TearDownPerformanceTest() 339 self.adb.TearDownPerformanceTest()
336 super(SingleTestRunner, self).TearDown() 340 super(SingleTestRunner, self).TearDown()
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698