2010-11-11 Dirk Pranke <dpranke@chromium.org>

        Unreviewed, build fix.

        fix build breakage caused by fix for bug 49380 (r71858).

        config_standalone needs to ensure that the packages it needs are
        in sys.path.

        https://bugs.webkit.org/show_bug.cgi?id=49419

        * Scripts/webkitpy/layout_tests/port/config_standalone.py:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71873 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 7c8c5daf777c35e64a4f04c4e95e06ab22a45601..3593c005bfb6298990e068645b7dac1c469ed133 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-11  Dirk Pranke  <dpranke@chromium.org>
+
+        Unreviewed, build fix.
+
+        fix build breakage caused by fix for bug 49380 (r71858).
+
+        config_standalone needs to ensure that the packages it needs are
+        in sys.path.
+
+        https://bugs.webkit.org/show_bug.cgi?id=49419
+
+        * Scripts/webkitpy/layout_tests/port/config_standalone.py:
+
 2010-11-11  Dirk Pranke  <dpranke@chromium.org>
 
         Reviewed by Adam Roben.

diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/config_standalone.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/config_standalone.py
index 1fc81db2ae862e2c2f84e47202761eda43c09716..3dec3b91c4562beca91ba50e7c7215b5b42ddcaf 100644 (file)
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/config_standalone.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/config_standalone.py
@@ -34,13 +34,21 @@ this test when we remove the global configuration cache in config.py."""
 
 import os
 import unittest
+import sys
+
+
+# Ensure that webkitpy is in PYTHONPATH.
+this_dir = os.path.abspath(sys.path[0])
+up = os.path.dirname
+script_dir = up(up(up(this_dir)))
+if script_dir not in sys.path:
+    sys.path.append(script_dir)
 
 from webkitpy.common.system import executive
 from webkitpy.common.system import executive_mock
 from webkitpy.common.system import filesystem
 from webkitpy.common.system import filesystem_mock
 
-import sys
 import config