Title: [120736] trunk
Revision
120736
Author
[email protected]
Date
2012-06-19 11:03:22 -0700 (Tue, 19 Jun 2012)

Log Message

new-run-webkit-tests reports unexpected pass of pixel tests when pixel testing is disabled
https://bugs.webkit.org/show_bug.cgi?id=85446

Reviewed by Simon Fraser.

Tools:

Embed whether pixel testing was enabled into the results.json.

* Scripts/webkitpy/layout_tests/controllers/manager.py:
(summarize_results):

LayoutTests:

This change makes results.html aware of whether pixel tests were
enabled when the tests were run; if they weren't, we ignore
expected IMAGE tests that pass instead of reporting them as
'unexpected pass'.

* fast/harness/resources/results-test.js:
(mockResults):
* fast/harness/results.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (120735 => 120736)


--- trunk/LayoutTests/ChangeLog	2012-06-19 17:59:44 UTC (rev 120735)
+++ trunk/LayoutTests/ChangeLog	2012-06-19 18:03:22 UTC (rev 120736)
@@ -1,3 +1,19 @@
+2012-06-19  Dirk Pranke  <[email protected]>
+
+        new-run-webkit-tests reports unexpected pass of pixel tests when pixel testing is disabled
+        https://bugs.webkit.org/show_bug.cgi?id=85446
+
+        Reviewed by Simon Fraser.
+
+        This change makes results.html aware of whether pixel tests were
+        enabled when the tests were run; if they weren't, we ignore
+        expected IMAGE tests that pass instead of reporting them as
+        'unexpected pass'.
+
+        * fast/harness/resources/results-test.js:
+        (mockResults):
+        * fast/harness/results.html:
+
 2012-06-19  Andreas Kling  <[email protected]>
 
         Remove the -webkit-match-nearest-mail-blockquote-color property.

Modified: trunk/LayoutTests/fast/harness/resources/results-test.js (120735 => 120736)


--- trunk/LayoutTests/fast/harness/resources/results-test.js	2012-06-19 17:59:44 UTC (rev 120735)
+++ trunk/LayoutTests/fast/harness/resources/results-test.js	2012-06-19 18:03:22 UTC (rev 120736)
@@ -30,7 +30,8 @@
         "uses_expectations_file": true,
         "has_pretty_patch": false,
         "has_wdiff": false,
-        "revision": 12345
+        "revision": 12345,
+        "pixel_tests_enabled": true
     };
 }
 

Modified: trunk/LayoutTests/fast/harness/results.html (120735 => 120736)


--- trunk/LayoutTests/fast/harness/results.html	2012-06-19 17:59:44 UTC (rev 120735)
+++ trunk/LayoutTests/fast/harness/results.html	2012-06-19 18:03:22 UTC (rev 120736)
@@ -486,7 +486,9 @@
     }
 
     if (actual == 'PASS' && expected != 'PASS') {
-        globalState().unexpectedPassTests.push(testObject);
+        if (expected != 'IMAGE' || globalState().results.pixel_tests_enabled) {
+            globalState().unexpectedPassTests.push(testObject);
+        }
         return;
     }
 

Modified: trunk/Tools/ChangeLog (120735 => 120736)


--- trunk/Tools/ChangeLog	2012-06-19 17:59:44 UTC (rev 120735)
+++ trunk/Tools/ChangeLog	2012-06-19 18:03:22 UTC (rev 120736)
@@ -1,3 +1,15 @@
+2012-06-19  Dirk Pranke  <[email protected]>
+
+        new-run-webkit-tests reports unexpected pass of pixel tests when pixel testing is disabled
+        https://bugs.webkit.org/show_bug.cgi?id=85446
+
+        Reviewed by Simon Fraser.
+
+        Embed whether pixel testing was enabled into the results.json.
+
+        * Scripts/webkitpy/layout_tests/controllers/manager.py:
+        (summarize_results):
+
 2012-06-19  Zoltan Horvath  <[email protected]>
 
         [Qt] Modify HTTPS port to 8443 for performance tests

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py (120735 => 120736)


--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py	2012-06-19 17:59:44 UTC (rev 120735)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py	2012-06-19 18:03:22 UTC (rev 120736)
@@ -236,6 +236,8 @@
     results['layout_tests_dir'] = port_obj.layout_tests_dir()
     results['has_wdiff'] = port_obj.wdiff_available()
     results['has_pretty_patch'] = port_obj.pretty_patch_available()
+    results['pixel_tests_enabled'] = port_obj.get_option('pixel_tests')
+
     try:
         # We only use the svn revision for using trac links in the results.html file,
         # Don't do this by default since it takes >100ms.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to