Changeset 83908 in webkit

Timestamp:

Apr 14, 2011, 4:12:12 PM (15 years ago)

Author:

ojan@chromium.org

Message:

2011-04-14 Ojan Vafai <​ojan@chromium.org>

Reviewed by Eric Seidel.

only show expected failure type for ports that use an expectations file
​https://bugs.webkit.org/show_bug.cgi?id=58588

• Scripts/webkitpy/layout_tests/layout_package/json_results.html:
• Scripts/webkitpy/layout_tests/layout_package/test_runner.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/json_results.html (modified) (3 diffs)
• Scripts/webkitpy/layout_tests/layout_package/test_runner.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-14  Ojan Vafai  <ojan@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        only show expected failure type for ports that use an expectations file
+        https://bugs.webkit.org/show_bug.cgi?id=58588
+
+        * Scripts/webkitpy/layout_tests/layout_package/json_results.html:
+        * Scripts/webkitpy/layout_tests/layout_package/test_runner.py:
+
 2011-04-14  Eric Seidel  <eric@webkit.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results.html

@@ -51 +51 @@
         '<th id="text-results-header">text results</th>' +
         '<th id="image-results-header">image results</th>' +
-        '<th>failure type</th>' +
-        '<th>expected failure type</th>' +
-    '</tr></thead>';
+        '<th>failure type</th>';
+        
+if (results.uses_expectations_file)
+    html += '<th>expected failure type</th>';
+
+html += '</tr></thead>';
 
 // FIXME: Should this point to the local file instead? Should it dynamically figure out where to point?
@@ -66 +69 @@
 // FIXME: allow zooming in on pixel diffs
 // FIXME: store stderr information in the json
-// FIXME: don't show expected failure type for non-chromium ports
 
 var hasTextFailures = false;
@@ -103 +105 @@
   // FIXME: Handle stderr output.
   row += '<td>' + actual + '</td>';
-  row += '<td>' + results.tests[test].expected + '</td>';
+  
+  if (results.uses_expectations_file)
+    row += '<td>' + results.tests[test].expected + '</td>';
+
   html += '<tr>' + row + '</tr>';
 }

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/test_runner.py

@@ -155 +155 @@
     results['num_flaky'] = num_flaky
     results['num_regressions'] = num_regressions
+    # FIXME: If non-chromium ports start using an expectations file,
+    # we should make this check more robust.
+    results['uses_expectations_file'] = port_obj.name().find('chromium') != -1
 
     return results