diff options
| author | jknotten@chromium.org <jknotten@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-23 20:32:53 +0000 |
|---|---|---|
| committer | jknotten@chromium.org <jknotten@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-23 20:32:53 +0000 |
| commit | 0df4a4887f7d2db22ec746d612ed6107a8f92c59 (patch) | |
| tree | bc021a4fe4eb4491ee02d903f21a38a553b45f7a /build | |
| parent | bba499c70f91dd85196ce56a4559fa6a957f210f (diff) | |
| download | chromium_src-0df4a4887f7d2db22ec746d612ed6107a8f92c59.zip chromium_src-0df4a4887f7d2db22ec746d612ed6107a8f92c59.tar.gz chromium_src-0df4a4887f7d2db22ec746d612ed6107a8f92c59.tar.bz2 | |
Make sure that chrome/ dir exists for webkit_unit_tests on Android.
webkit_support::GetWebKitRootDirFilePath() looks for a chrome/ directory so
that it can identify this as a chrome working directory and therefore add
third_party/WebKit to the path to get the WebKit root dir. This normally
works because other unit tests pull in the chrome directory for their own
reasons, but if this is the first test run on a blank /data/local/tmp
directory, webkit_unit_test fails when it tries to load resources required
for the tests.
Pull in chrome/VERSION and thus ensure that the chrome/ directory exists.
TEST=webkit_unit_tests
Review URL: http://codereview.chromium.org/9433049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/android/single_test_runner.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/build/android/single_test_runner.py b/build/android/single_test_runner.py index ed422c1..fa5195b 100644 --- a/build/android/single_test_runner.py +++ b/build/android/single_test_runner.py @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# Copyright (c) 2012 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -187,6 +187,9 @@ class SingleTestRunner(BaseTestRunner): elif self.test_package.test_suite_basename == 'webkit_unit_tests': return [ 'third_party/WebKit/Source/WebKit/chromium/tests/data', + # We need the chrome/ directory to convice webkit_support:: + # GetWebKitRootDirFilePath() we're in a chrome working dir. + 'chrome/VERSION', ] return [] |