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

dglazkov at chromium.org dglazkov at chromium.org
Wed Dec 22 12:59:40 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 6535733d62aab6a9450a0aa58a9345cb0ad4475f
Author: dglazkov at chromium.org <dglazkov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 3 19:44:40 2010 +0000

    2010-09-03  Dimitri Glazkov  <dglazkov at chromium.org>
    
            Reviewed by Adam Barth.
    
            Fix reading configuraiton in NWRT to work on Windows.
            https://bugs.webkit.org/show_bug.cgi?id=45180
    
            * Scripts/webkitpy/layout_tests/port/base.py: Added 'perl' argument, because Windows doesn't know what to do
                with the file otherwise.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66761 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4681fff..2e927eb 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-03  Dimitri Glazkov  <dglazkov at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Fix reading configuraiton in NWRT to work on Windows.
+        https://bugs.webkit.org/show_bug.cgi?id=45180
+
+        * Scripts/webkitpy/layout_tests/port/base.py: Added 'perl' argument, because Windows doesn't know what to do
+            with the file otherwise.
+
 2010-09-03  Chris Rogers  <crogers at google.com>
 
         Unreviewed
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
index 93ca22d..6b7342d 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
@@ -636,7 +636,7 @@ class Port(object):
             return self._pretty_patch_error_html
 
     def _webkit_build_directory(self, args):
-        args = [self.script_path("webkit-build-directory")] + args
+        args = ["perl", self.script_path("webkit-build-directory")] + args
         return self._executive.run_command(args).rstrip()
 
     def _configuration_file_path(self):

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list