Title: [101455] trunk/Tools
- Revision
- 101455
- Author
- [email protected]
- Date
- 2011-11-30 00:17:19 -0800 (Wed, 30 Nov 2011)
Log Message
Skip writing the result of diff_image since non-chromium ports don't implement diff_image.
https://bugs.webkit.org/show_bug.cgi?id=73381
Reviewed by Ryosuke Niwa.
This is a quick fix for the breakage of tests on non-chromium port.
We should implement diff_image later on non-chromium ports.
* Scripts/webkitpy/layout_tests/controllers/test_result_writer.py:
(write_test_result):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (101454 => 101455)
--- trunk/Tools/ChangeLog 2011-11-30 08:11:24 UTC (rev 101454)
+++ trunk/Tools/ChangeLog 2011-11-30 08:17:19 UTC (rev 101455)
@@ -1,3 +1,16 @@
+2011-11-29 Hayato Ito <[email protected]>
+
+ Skip writing the result of diff_image since non-chromium ports don't implement diff_image.
+ https://bugs.webkit.org/show_bug.cgi?id=73381
+
+ Reviewed by Ryosuke Niwa.
+
+ This is a quick fix for the breakage of tests on non-chromium port.
+ We should implement diff_image later on non-chromium ports.
+
+ * Scripts/webkitpy/layout_tests/controllers/test_result_writer.py:
+ (write_test_result):
+
2011-11-29 Balazs Ankes <[email protected]>
[NRWT] Fix --platform=qt-5.0 --new-baseline combo
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py (101454 => 101455)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py 2011-11-30 08:11:24 UTC (rev 101454)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py 2011-11-30 08:17:19 UTC (rev 101455)
@@ -71,7 +71,9 @@
# FIXME: We should always have 2 images here.
if driver_output.image and expected_driver_output.image:
image_diff = port.diff_image(driver_output.image, expected_driver_output.image)[0]
- writer.write_image_diff_files(image_diff)
+ # Non-chromium ports return 'None' since they don't implement diff_image.
+ if image_diff is not None:
+ writer.write_image_diff_files(image_diff)
writer.copy_file(failure.reference_filename)
elif isinstance(failure, test_failures.FailureReftestMismatchDidNotOccur):
writer.write_image_files(driver_output.image, expected_image=None)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
