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

[hayato at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 6795a230fde0c4eb821482551bdce691eb9cad93
Author: hayato at chromium.org <hayato at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 18 18:29:02 2010 +0000

    2010-11-18  Hayato Ito  <hayato at chromium.org>
    
            Reviewed by Shinichiro Hamaji.
    
            [NRWT] Fix a break of '--new-baseline' feature which is caused by r72249.
    
            https://bugs.webkit.org/show_bug.cgi?id=49740
    
            * Scripts/webkitpy/layout_tests/test_types/text_diff.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72307 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 46f0116..c17bea2 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-18  Hayato Ito  <hayato at chromium.org>
+
+        Reviewed by Shinichiro Hamaji.
+
+        [NRWT] Fix a break of '--new-baseline' feature which is caused by r72249.
+
+        https://bugs.webkit.org/show_bug.cgi?id=49740
+
+        * Scripts/webkitpy/layout_tests/test_types/text_diff.py:
+
 2010-11-18  Tony Chang  <tony at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/test_types/text_diff.py b/WebKitTools/Scripts/webkitpy/layout_tests/test_types/text_diff.py
index 66e42ba..ca4b17d 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/test_types/text_diff.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/test_types/text_diff.py
@@ -66,7 +66,8 @@ class TestTextDiff(test_type_base.TestTypeBase):
             # Although all test_shell/DumpRenderTree output should be utf-8,
             # we do not ever decode it inside run-webkit-tests.  For some tests
             # DumpRenderTree may not output utf-8 text (e.g. webarchives).
-            self._save_baseline_data(filename, output, ".txt", encoding=None,
+            self._save_baseline_data(filename, actual_test_output.text,
+                                     ".txt", encoding=None,
                                      generate_new_baseline=test_args.new_baseline)
             return failures
 

-- 
WebKit Debian packaging