 Chromium Code Reviews
 Chromium Code Reviews Issue 9433049:
  Make sure that chrome/ dir exists for webkit_unit_tests on Android.  (Closed) 
  Base URL: http://git.chromium.org/chromium/src.git@master
    
  
    Issue 9433049:
  Make sure that chrome/ dir exists for webkit_unit_tests on Android.  (Closed) 
  Base URL: http://git.chromium.org/chromium/src.git@master| OLD | NEW | 
|---|---|
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 180 'tools/page_cycler', | 180 'tools/page_cycler', | 
| 181 'data/page_cycler', | 181 'data/page_cycler', | 
| 182 ] | 182 ] | 
| 183 for d in data: | 183 for d in data: | 
| 184 if not os.path.exists(d): | 184 if not os.path.exists(d): | 
| 185 raise Exception('Page cycler data not found.') | 185 raise Exception('Page cycler data not found.') | 
| 186 return data | 186 return data | 
| 187 elif self.test_package.test_suite_basename == 'webkit_unit_tests': | 187 elif self.test_package.test_suite_basename == 'webkit_unit_tests': | 
| 188 return [ | 188 return [ | 
| 189 'third_party/WebKit/Source/WebKit/chromium/tests/data', | 189 'third_party/WebKit/Source/WebKit/chromium/tests/data', | 
| 190 # We need the chrome/ directory to convice webkit_support:: | |
| 191 # GetWebKitRootDirFilePath() we're in a chrome working dir. | |
| 192 'chrome/VERSION', | |
| 
Yaron
2012/02/23 17:52:07
Why don't we need this downstream? Is this due to
 | |
| 190 ] | 193 ] | 
| 191 return [] | 194 return [] | 
| 192 | 195 | 
| 193 def LaunchHelperToolsForTestSuite(self): | 196 def LaunchHelperToolsForTestSuite(self): | 
| 194 """Launches helper tools for the test suite. | 197 """Launches helper tools for the test suite. | 
| 195 | 198 | 
| 196 Sometimes one test may need to run some helper tools first in order to | 199 Sometimes one test may need to run some helper tools first in order to | 
| 197 successfully complete the test. | 200 successfully complete the test. | 
| 198 """ | 201 """ | 
| 199 document_root = self._GetHttpServerDocumentRootForTestSuite() | 202 document_root = self._GetHttpServerDocumentRootForTestSuite() | 
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 307 | 310 | 
| 308 Returns: | 311 Returns: | 
| 309 A TestResults object. | 312 A TestResults object. | 
| 310 """ | 313 """ | 
| 311 self.SetUp() | 314 self.SetUp() | 
| 312 try: | 315 try: | 
| 313 self._RunTestsForSuiteInternal() | 316 self._RunTestsForSuiteInternal() | 
| 314 finally: | 317 finally: | 
| 315 self.TearDown() | 318 self.TearDown() | 
| 316 return self.test_results | 319 return self.test_results | 
| OLD | NEW |