2010-11-18 Hayato Ito <hayato@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: https://svn.webkit.org/repository/webkit/trunk@72307 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 46f0116457a375e3cb991e667a0334b9eff06a52..c17bea2b36f31f09f22a41c9718b1ad817318709 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-18  Hayato Ito  <hayato@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@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 66e42ba14ca826f45411c5195428532b0fa5be11..ca4b17d7e1a39fcb0a86eac02707ee01cbf95766 100644 (file)
--- 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