[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 0ec66ceaa0faf0e5be5beefe3851758636645114
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 18 08:54:47 2010 +0000

    2010-02-18  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Adam Barth.
    
            run-chromium-webkit-tests --platform=mac-leopard needs to run build-dumprendertree
            https://bugs.webkit.org/show_bug.cgi?id=35053
    
            * Scripts/webkitpy/layout_tests/port/base.py: Add script_path() function for finding scripts.
            * Scripts/webkitpy/layout_tests/port/chromium.py: Remove unused argument.
            * Scripts/webkitpy/layout_tests/port/mac.py:
             - Make sure that calling webkit-build-directory works even if Scripts/ is not in the user's path.
             - Call build-dumprendertree (and make sure it succeeds) before running the tests.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54945 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f008433..194e25d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-18  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
+        run-chromium-webkit-tests --platform=mac-leopard needs to run build-dumprendertree
+        https://bugs.webkit.org/show_bug.cgi?id=35053
+
+        * Scripts/webkitpy/layout_tests/port/base.py: Add script_path() function for finding scripts.
+        * Scripts/webkitpy/layout_tests/port/chromium.py: Remove unused argument.
+        * Scripts/webkitpy/layout_tests/port/mac.py:
+         - Make sure that calling webkit-build-directory works even if Scripts/ is not in the user's path.
+         - Call build-dumprendertree (and make sure it succeeds) before running the tests.
+
 2010-02-16  Chris Jerdonek  <cjerdonek at webkit.org>
 
         Reviewed by Shinichiro Hamaji.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
index e0c7a3f..2b25e29 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
@@ -269,6 +269,7 @@ class Port(object):
         used by run-chromium-webkit-tests."""
         raise NotImplementedError('Port.num_cores')
 
+    # FIXME: This could be replaced by functions in webkitpy.scm.
     def path_from_webkit_base(self, *comps):
         """Returns the full path to path made by joining the top of the
         WebKit source tree and the list of path components in |*comps|."""
@@ -277,6 +278,10 @@ class Port(object):
             self._webkit_base_dir = abspath[0:abspath.find('WebKitTools')]
         return os.path.join(self._webkit_base_dir, *comps)
 
+    # FIXME: Callers should eventually move to scm.script_path.
+    def script_path(self, script_name):
+        return self.path_from_webkit_base("WebKitTools", "Scripts", script_name)
+
     def path_to_test_expectations_file(self):
         """Update the test expectations to the passed-in string.
 
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
index a175343..1123376 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
@@ -132,7 +132,7 @@ class ChromiumPort(base.Port):
     def test_base_platform_names(self):
         return ('linux', 'mac', 'win')
 
-    def test_expectations(self, options=None):
+    def test_expectations(self):
         """Returns the test expectations for this port.
 
         Basically this string should contain the equivalent of a
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py
index 58012f8..d355f62 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py
@@ -67,8 +67,16 @@ class MacPort(base.Port):
         return dirs
 
     def check_sys_deps(self):
-        # FIXME: This should run build-dumprendertree.
-        # This should also validate that all of the tool paths are valid.
+        if executive.run_command([self.script_path("build-dumprendertree")], return_exit_code=True) != 0:
+            return False
+
+        driver_path = self._path_to_driver()
+        if not os.path.exists(driver_path):
+            logging.error("DumpRenderTree was not found at %s" % driver_path)
+            return False
+
+        # This should also validate that the ImageDiff path is valid (once this script knows how to use ImageDiff).
+        # https://bugs.webkit.org/show_bug.cgi?id=34826
         return True
 
     def num_cores(self):
@@ -104,7 +112,7 @@ class MacPort(base.Port):
         return ('mac',)
 
     def _skipped_file_paths(self):
-        # This method will need to be made work for non-mac platforms and moved into base.Port.
+        # FIXME: This method will need to be made work for non-mac platforms and moved into base.Port.
         skipped_files = []
         if self._name in ('mac-tiger', 'mac-leopard', 'mac-snowleopard'):
             skipped_files.append(os.path.join(
@@ -206,7 +214,7 @@ class MacPort(base.Port):
 
     def _build_path(self, *comps):
         if not self._cached_build_root:
-            self._cached_build_root = executive.run_command(["webkit-build-directory", "--top-level"]).rstrip()
+            self._cached_build_root = executive.run_command([self.script_path("webkit-build-directory"), "--top-level"]).rstrip()
         return os.path.join(self._cached_build_root, self._options.target, *comps)
 
     def _kill_process(self, pid):

-- 
WebKit Debian packaging