Title: [126070] trunk/Tools
- Revision
- 126070
- Author
- [email protected]
- Date
- 2012-08-20 14:30:38 -0700 (Mon, 20 Aug 2012)
Log Message
temporarily disable ImageDiff on WK2 ports for ref tests
https://bugs.webkit.org/show_bug.cgi?id=94517
Reviewed by Brady Eidson.
ImageDiff appears to be unable to handle the pngs returned from
WebKitTestRunner, so we disable checking images by default
for ref tests on wk2 ports (unless pixel tests is explicitly enabled).
* Scripts/webkitpy/layout_tests/controllers/single_test_runner.py:
(SingleTestRunner._compare_output_with_reference):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (126069 => 126070)
--- trunk/Tools/ChangeLog 2012-08-20 21:16:51 UTC (rev 126069)
+++ trunk/Tools/ChangeLog 2012-08-20 21:30:38 UTC (rev 126070)
@@ -1,5 +1,19 @@
2012-08-20 Dirk Pranke <[email protected]>
+ temporarily disable ImageDiff on WK2 ports for ref tests
+ https://bugs.webkit.org/show_bug.cgi?id=94517
+
+ Reviewed by Brady Eidson.
+
+ ImageDiff appears to be unable to handle the pngs returned from
+ WebKitTestRunner, so we disable checking images by default
+ for ref tests on wk2 ports (unless pixel tests is explicitly enabled).
+
+ * Scripts/webkitpy/layout_tests/controllers/single_test_runner.py:
+ (SingleTestRunner._compare_output_with_reference):
+
+2012-08-20 Dirk Pranke <[email protected]>
+
Add missing FIXME: to previous change.
https://bugs.webkit.org/show_bug.cgi?id=94505
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py (126069 => 126070)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py 2012-08-20 21:16:51 UTC (rev 126069)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py 2012-08-20 21:30:38 UTC (rev 126070)
@@ -320,6 +320,10 @@
if failures:
return TestResult(self._test_name, failures, total_test_time, has_stderr)
+ if self._options.webkit_test_runner and not self._options.pixel_tests:
+ # don't check pixel results for WTR/WK2; they're broken.
+ return TestResult(self._test_name, failures, total_test_time, has_stderr)
+
if not driver_output1.image_hash and not driver_output2.image_hash:
failures.append(test_failures.FailureReftestNoImagesGenerated(reference_filename))
elif mismatch:
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
