From fe6fec623c158201273ea476978ee4db4b71bd1c Mon Sep 17 00:00:00 2001 From: "jknotten@chromium.org" Date: Thu, 23 Feb 2012 20:32:53 +0000 Subject: [PATCH] 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: http://src.chromium.org/svn/trunk/src/build@123312 4ff67af0-8c30-449e-8e8b-ad334ec8d88c --- android/single_test_runner.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/android/single_test_runner.py b/android/single_test_runner.py index ed422c1f2..fa5195b28 100644 --- a/android/single_test_runner.py +++ b/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 []