[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

dpranke at chromium.org dpranke at chromium.org
Sun Feb 20 23:56:54 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit c2257daa15353d5c0052089728a8a29f8769d7b2
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 27 02:01:43 2011 +0000

    2011-01-26  Dirk Pranke  <dpranke at chromium.org>
    
            Reviewed by Mihai Parparita.
    
            Fix regression introduced in r76322 ... new-run-webkit-tests
            was attempting to save the image diff output as a UTF-8-encoded
            file.
    
            https://bugs.webkit.org/show_bug.cgi?id=53210
    
            * Scripts/webkitpy/layout_tests/port/webkit.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76746 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index b8aff57..44663db 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-26  Dirk Pranke  <dpranke at chromium.org>
+
+        Reviewed by Mihai Parparita.
+
+        Fix regression introduced in r76322 ... new-run-webkit-tests
+        was attempting to save the image diff output as a UTF-8-encoded
+        file.
+
+        https://bugs.webkit.org/show_bug.cgi?id=53210
+
+        * Scripts/webkitpy/layout_tests/port/webkit.py:
+
 2011-01-26  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r76709.
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/webkit.py b/Tools/Scripts/webkitpy/layout_tests/port/webkit.py
index 476555c..0834474 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/webkit.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/webkit.py
@@ -159,7 +159,7 @@ class WebKitPort(base.Port):
             if m.group(2) == 'passed':
                 result = False
         elif output and diff_filename:
-            self._filesystem.write_text_file(diff_filename, output)
+            self._filesystem.write_binary_file(diff_filename, output)
         elif sp.timed_out:
             _log.error("ImageDiff timed out")
         elif sp.crashed:

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list