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

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

Issue 10536140: Make GetWebKitRootDirFilePath return correct dir on Android. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 6 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 | webkit/support/webkit_support.cc » ('j') | 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 logging 5 import logging
6 import os 6 import os
7 import sys 7 import sys
8 8
9 from base_test_runner import BaseTestRunner 9 from base_test_runner import BaseTestRunner
10 import debug_info 10 import debug_info
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 'tools/page_cycler', 186 'tools/page_cycler',
187 'data/page_cycler', 187 'data/page_cycler',
188 ] 188 ]
189 for d in data: 189 for d in data:
190 if not os.path.exists(d): 190 if not os.path.exists(d):
191 raise Exception('Page cycler data not found.') 191 raise Exception('Page cycler data not found.')
192 return data 192 return data
193 elif self.test_package.test_suite_basename == 'webkit_unit_tests': 193 elif self.test_package.test_suite_basename == 'webkit_unit_tests':
194 return [ 194 return [
195 'third_party/WebKit/Source/WebKit/chromium/tests/data', 195 'third_party/WebKit/Source/WebKit/chromium/tests/data',
196 # We need the chrome/ directory to convice webkit_support::
197 # GetWebKitRootDirFilePath() we're in a chrome working dir.
198 'chrome/VERSION',
199 ] 196 ]
200 return [] 197 return []
201 198
202 def LaunchHelperToolsForTestSuite(self): 199 def LaunchHelperToolsForTestSuite(self):
203 """Launches helper tools for the test suite. 200 """Launches helper tools for the test suite.
204 201
205 Sometimes one test may need to run some helper tools first in order to 202 Sometimes one test may need to run some helper tools first in order to
206 successfully complete the test. 203 successfully complete the test.
207 """ 204 """
208 document_root = self._GetHttpServerDocumentRootForTestSuite() 205 document_root = self._GetHttpServerDocumentRootForTestSuite()
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 def TearDown(self): 301 def TearDown(self):
305 """Cleans up the test enviroment for the test suite.""" 302 """Cleans up the test enviroment for the test suite."""
306 self.test_package.tool.CleanUpEnvironment() 303 self.test_package.tool.CleanUpEnvironment()
307 if self.test_package.cleanup_test_files: 304 if self.test_package.cleanup_test_files:
308 self.adb.RemovePushedFiles() 305 self.adb.RemovePushedFiles()
309 if self.dump_debug_info: 306 if self.dump_debug_info:
310 self.dump_debug_info.StopRecordingLog() 307 self.dump_debug_info.StopRecordingLog()
311 if self.test_package.performance_test: 308 if self.test_package.performance_test:
312 self.adb.TearDownPerformanceTest() 309 self.adb.TearDownPerformanceTest()
313 super(SingleTestRunner, self).TearDown() 310 super(SingleTestRunner, self).TearDown()
OLDNEW
« no previous file with comments | « no previous file | webkit/support/webkit_support.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698