Changeset 83917 in webkit

Timestamp:

Apr 14, 2011 5:44:42 PM (13 years ago)

Author:

ojan@chromium.org

Message:

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

Reviewed by Eric Seidel.

add checkbox to only show unexpected results to new results file
​https://bugs.webkit.org/show_bug.cgi?id=58606

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

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-14  Ojan Vafai  <ojan@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        add checkbox to only show unexpected results to new results file
+        https://bugs.webkit.org/show_bug.cgi?id=58606
+
+        * Scripts/webkitpy/layout_tests/layout_package/json_results.html:
+
 2011-04-13  Brent Fulgham  <bfulgham@webkit.org>
 

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

@@ -25 +25 @@
     -moz-user-select: none;
 }
+
+label {
+    margin-left: 10px;
+}
 </style>
 
@@ -35 +39 @@
 </script>
 
-<!-- FIXME: once we are happy with this page, load full_results.json 
-and have a checkbox to show only unexpected results. -->
-<script src="unexpected_results.json"></script>
+<script src="full_results.json"></script>
 
 <script>
@@ -46 +48 @@
 }
 
-var html = 'Tests where results did not match expected results:<table>' +
-    '<thead><tr>' +
+var html = 'Tests where results did not match expected results:';
+
+if (results.uses_expectations_file)
+    html += '<label><input class="unexpected-results" type=checkbox checked>Only show unexpected results</label>';
+
+html += '<table><thead><tr>' +
         '<th>test</th>' +
         '<th id="text-results-header">text results</th>' +
@@ -75 +81 @@
 html += '<tbody>';
 for (var test in results.tests) {
+  var actual = results.tests[test].actual;
+  var expected = results.tests[test].expected || 'PASS';
+  
+  if (actual == 'PASS' && (!results.uses_expectations_file || expected == 'PASS'))
+    continue;
+
   var row = '<td><a href="' + test_base_path + test + '">' + test + '</a></td>';
   var test_prefix = stripExtension(test);
 
   row += '<td>';
-  var actual = results.tests[test].actual;
   // FIXME: only include timeout actual/expected results here if we actually spit out results for timeout tests.
   if (actual == 'CRASH')
@@ -107 +118 @@
   
   if (results.uses_expectations_file)
-    row += '<td>' + results.tests[test].expected + '</td>';
-
-  html += '<tr>' + row + '</tr>';
+    row += '<td>' + expected + '</td>';
+
+  var isExpected = results.uses_expectations_file && expected == actual;
+  html += '<tr class="' + (isExpected ? 'expected' : '') + '">' + row + '</tr>';
 }
 
@@ -197 +209 @@
 document.querySelector('table').addEventListener('click', TableSorter.handleClick, false);
 
+var unexpectedStyleNode = document.createElement('style');
+document.body.appendChild(unexpectedStyleNode);
+
+function updateExpectedResults()
+{
+    if (document.querySelector('.unexpected-results').checked)
+        unexpectedStyleNode.innerText = '.expected { display: none; }';
+    else
+        unexpectedStyleNode.innerText = '';
+}
+
+updateExpectedResults();
+document.querySelector('.unexpected-results').addEventListener('change', updateExpectedResults, false);
+
 if (!hasTextFailures)
   document.body.querySelector('#text-results-header').textContent = '';