summaryrefslogtreecommitdiffstats
path: root/webkit/tools/layout_tests/layout_package
diff options
context:
space:
mode:
authormhm@chromium.org <mhm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-08 00:28:39 +0000
committermhm@chromium.org <mhm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-08 00:28:39 +0000
commit32ea48ecd3fb3e57413795523f0c67752f5e73f1 (patch)
tree1d80b1351e5d16816bef581f6a952bb8e094ce91 /webkit/tools/layout_tests/layout_package
parent1a534a31f8b4834a8f4785eb08652cc66360524a (diff)
downloadchromium_src-32ea48ecd3fb3e57413795523f0c67752f5e73f1.zip
chromium_src-32ea48ecd3fb3e57413795523f0c67752f5e73f1.tar.gz
chromium_src-32ea48ecd3fb3e57413795523f0c67752f5e73f1.tar.bz2
Fix ui tests WorkerHttpLayoutTests failure.
The http_server python script had everything defined in the batch script, but the ui tests use the python file directly. This makes sure the google python package gets imported successfully. TBR=thestig BUG=6784 TEST=run http_server.py directly, not via sh. Review URL: http://codereview.chromium.org/271016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28355 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/layout_tests/layout_package')
-rwxr-xr-xwebkit/tools/layout_tests/layout_package/http_server.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/layout_package/http_server.py b/webkit/tools/layout_tests/layout_package/http_server.py
index f438f43..591bee9 100755
--- a/webkit/tools/layout_tests/layout_package/http_server.py
+++ b/webkit/tools/layout_tests/layout_package/http_server.py
@@ -17,6 +17,9 @@ import time
import urllib
import path_utils
+
+# So we can import httpd_utils below to make ui_tests happy.
+sys.path.append(path_utils.PathFromBase('tools', 'python'))
import google.httpd_utils
def RemoveLogFiles(folder, starts_with):