[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[eric at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit b3b79259a523822b1ea75c058ec122226d57442e
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 5 09:14:12 2010 +0000

    2010-11-05  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Adam Barth.
    
            build-webkit spams system.log by repeatedly checking for PBXProductDirectory in com.apple.Xcode
            https://bugs.webkit.org/show_bug.cgi?id=49051
    
            This is a speculative fix.  The unit tests cover these methods, however
            I don't know if this will fully stop the system.log spam.
    
            * Scripts/webkitpy/layout_tests/port/base.py:
            * Scripts/webkitpy/layout_tests/port/webkit.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71398 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 2ebe6f9..d6a4e4f 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,19 @@
 
         Reviewed by Adam Barth.
 
+        build-webkit spams system.log by repeatedly checking for PBXProductDirectory in com.apple.Xcode
+        https://bugs.webkit.org/show_bug.cgi?id=49051
+
+        This is a speculative fix.  The unit tests cover these methods, however
+        I don't know if this will fully stop the system.log spam.
+
+        * Scripts/webkitpy/layout_tests/port/base.py:
+        * Scripts/webkitpy/layout_tests/port/webkit.py:
+
+2010-11-05  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
         Add basic support for showing bot id on /queue-status/ pages
         https://bugs.webkit.org/show_bug.cgi?id=49037
 
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
index cd7d663..a98b858 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
@@ -47,6 +47,7 @@ import http_server
 import test_files
 import websocket_server
 
+from webkitpy.common.memoized import memoized
 from webkitpy.common.system import logutils
 from webkitpy.common.system.executive import Executive, ScriptError
 from webkitpy.common.system.path import abspath_to_uri
@@ -725,13 +726,25 @@ class Port(object):
                        e.message_with_output()))
             return self._pretty_patch_error_html
 
-    def _webkit_build_directory(self, args):
-        args = ["perl", self.script_path("webkit-build-directory")] + args
+    def _webkit_build_directory_command(self, args):
+        return ["perl", self.script_path("webkit-build-directory")] + args
+
+    @memoized
+    def _webkit_top_level_build_directory(self, top_level=True):
+        """This directory is above where products are built to and contains things like the Configuration file."""
+        args = self._webkit_build_directory_command(["--top-level"])
+        return self._executive.run_command(args).rstrip()
+
+    @memoized
+    def _webkit_configuration_build_directory(self, configuration=None):
+        """This is where products are normally built to."""
+        if not configuration:
+            configuration = self.flag_from_configuration(self.get_option('configuration'))
+        args = self._webkit_build_directory_command(["--configuration", configuration])
         return self._executive.run_command(args).rstrip()
 
     def _configuration_file_path(self):
-        build_root = self._webkit_build_directory(["--top-level"])
-        return os.path.join(build_root, "Configuration")
+        return os.path.join(self._webkit_top_level_build_directory(), "Configuration")
 
     # Easy override for unit tests
     def _open_configuration_file(self):
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py
index 0d0d3e0..0b324f5 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py
@@ -60,7 +60,6 @@ class WebKitPort(base.Port):
 
     def __init__(self, **kwargs):
         base.Port.__init__(self, **kwargs)
-        self._cached_build_root = None
         self._cached_apache_path = None
 
         # FIXME: disable pixel tests until they are run by default on the
@@ -358,12 +357,8 @@ class WebKitPort(base.Port):
             'mac-tiger', 'mac-leopard', 'mac-snowleopard')
 
     def _build_path(self, *comps):
-        if not self._cached_build_root:
-            self._cached_build_root = self._webkit_build_directory([
-                "--configuration",
-                self.flag_from_configuration(self.get_option('configuration')),
-            ])
-        return os.path.join(self._cached_build_root, *comps)
+        build_root = self._webkit_configuration_build_directory()
+        return os.path.join(build_root, *comps)
 
     def _path_to_driver(self):
         return self._build_path('DumpRenderTree')

-- 
WebKit Debian packaging