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

Side by Side Diff: build/android/pylib/gtest/test_runner.py

Issue 19832003: Update the new path to WebKit tests data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | « 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 logging 5 import logging
6 import os 6 import os
7 import re 7 import re
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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 108
109 The path of this directory is different when the suite is being run as 109 The path of this directory is different when the suite is being run as
110 part of a WebKit check-out. 110 part of a WebKit check-out.
111 """ 111 """
112 webkit_src = os.path.join(constants.DIR_SOURCE_ROOT, 'third_party', 112 webkit_src = os.path.join(constants.DIR_SOURCE_ROOT, 'third_party',
113 'WebKit') 113 'WebKit')
114 if self.in_webkit_checkout: 114 if self.in_webkit_checkout:
115 webkit_src = os.path.join(constants.DIR_SOURCE_ROOT, '..', '..', '..') 115 webkit_src = os.path.join(constants.DIR_SOURCE_ROOT, '..', '..', '..')
116 116
117 self.adb.PushIfNeeded( 117 self.adb.PushIfNeeded(
118 os.path.join(webkit_src, 'Source/WebKit/chromium/tests/data'), 118 os.path.join(webkit_src, 'Source/web/tests/data'),
119 os.path.join( 119 os.path.join(
120 self.adb.GetExternalStorage(), 120 self.adb.GetExternalStorage(),
121 'third_party/WebKit/Source/WebKit/chromium/tests/data')) 121 'third_party/WebKit/Source/web/tests/data'))
122 self.adb.PushIfNeeded( 122 self.adb.PushIfNeeded(
123 os.path.join(constants.DIR_SOURCE_ROOT, 123 os.path.join(constants.DIR_SOURCE_ROOT,
124 'third_party/hyphen/hyph_en_US.dic'), 124 'third_party/hyphen/hyph_en_US.dic'),
125 os.path.join(self.adb.GetExternalStorage(), 125 os.path.join(self.adb.GetExternalStorage(),
126 'third_party/hyphen/hyph_en_US.dic')) 126 'third_party/hyphen/hyph_en_US.dic'))
127 127
128 def _ParseTestOutput(self, p): 128 def _ParseTestOutput(self, p):
129 """Process the test output. 129 """Process the test output.
130 130
131 Args: 131 Args:
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 super(TestRunner, self).SetUp() 233 super(TestRunner, self).SetUp()
234 if _TestSuiteRequiresMockTestServer(self.test_package.suite_basename): 234 if _TestSuiteRequiresMockTestServer(self.test_package.suite_basename):
235 self.LaunchChromeTestServerSpawner() 235 self.LaunchChromeTestServerSpawner()
236 self.tool.SetupEnvironment() 236 self.tool.SetupEnvironment()
237 237
238 #override 238 #override
239 def TearDown(self): 239 def TearDown(self):
240 """Cleans up the test enviroment for the test suite.""" 240 """Cleans up the test enviroment for the test suite."""
241 self.tool.CleanUpEnvironment() 241 self.tool.CleanUpEnvironment()
242 super(TestRunner, self).TearDown() 242 super(TestRunner, 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