Title: [125954] trunk/Tools
- Revision
- 125954
- Author
- [email protected]
- Date
- 2012-08-17 17:25:44 -0700 (Fri, 17 Aug 2012)
Log Message
nrwt: don't fail tests if ImageDiff fails on the wk2 ports
https://bugs.webkit.org/show_bug.cgi?id=94396
Reviewed by Ryosuke Niwa.
It appears that WTR is generating PNGs that ImageDiff doesn't
like, and so we're getting lots of "can not get ImageDiff"
errors (see bug 81962). The change in r124581 made this a test
failure, and this is causing the WK2 bots to frequently abort
with 500+ failures.
This change makes ImageDiff errors not be test failures just for
WK2 for now until we can better triage what's going on.
* Scripts/webkitpy/layout_tests/controllers/single_test_runner.py:
(SingleTestRunner._compare_image):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (125953 => 125954)
--- trunk/Tools/ChangeLog 2012-08-18 00:10:11 UTC (rev 125953)
+++ trunk/Tools/ChangeLog 2012-08-18 00:25:44 UTC (rev 125954)
@@ -1,3 +1,22 @@
+2012-08-17 Dirk Pranke <[email protected]>
+
+ nrwt: don't fail tests if ImageDiff fails on the wk2 ports
+ https://bugs.webkit.org/show_bug.cgi?id=94396
+
+ Reviewed by Ryosuke Niwa.
+
+ It appears that WTR is generating PNGs that ImageDiff doesn't
+ like, and so we're getting lots of "can not get ImageDiff"
+ errors (see bug 81962). The change in r124581 made this a test
+ failure, and this is causing the WK2 bots to frequently abort
+ with 500+ failures.
+
+ This change makes ImageDiff errors not be test failures just for
+ WK2 for now until we can better triage what's going on.
+
+ * Scripts/webkitpy/layout_tests/controllers/single_test_runner.py:
+ (SingleTestRunner._compare_image):
+
2012-08-17 James Robinson <[email protected]>
[chromium] Add a style check for #include "cc/..." in chromium files
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py (125953 => 125954)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py 2012-08-18 00:10:11 UTC (rev 125953)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py 2012-08-18 00:25:44 UTC (rev 125954)
@@ -266,7 +266,10 @@
elif driver_output.image_hash != expected_driver_output.image_hash:
diff_result = self._port.diff_image(driver_output.image, expected_driver_output.image)
err_str = diff_result[2]
- if err_str:
+ # FIXME: see https://bugs.webkit.org/show_bug.cgi?id=94277 and
+ # https://bugs.webkit.org/show_bug.cgi?id=81962; ImageDiff doesn't
+ # seem to be working with WTR properly and tons of tests are failing.
+ if err_str and not self._options.webkit_test_runner:
_log.warning(' %s : %s' % (self._test_name, err_str))
failures.append(test_failures.FailureImageHashMismatch())
driver_output.error = (driver_output.error or '') + err_str
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes