Changeset 84074 in webkit

Timestamp:

Apr 15, 2011 8:02:45 PM (13 years ago)

Author:

ojan@chromium.org

Message:

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

Reviewed by Eric Seidel.

show stderr files and httpd log files
​https://bugs.webkit.org/show_bug.cgi?id=58714

• 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) (12 diffs)
• Scripts/webkitpy/layout_tests/layout_package/test_runner.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-15  Ojan Vafai  <ojan@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        show stderr files and httpd log files
+        https://bugs.webkit.org/show_bug.cgi?id=58714
+
+        * Scripts/webkitpy/layout_tests/layout_package/json_results.html:
+        * Scripts/webkitpy/layout_tests/layout_package/test_runner.py:
+
 2011-04-15  Shishir Agrawal  <shishir@chromium.org>
 

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

@@ -5 +5 @@
 }
 
+thead tr:nth-child(odd), tr:nth-child(even) {
+    background-color: #E3E9FF;
+}
+
 tr:nth-child(odd) {
-    background-color: #E3E9FF;
-}
-
-thead tr, tr:nth-child(even) {
-    background-color: #BCF;
+    background-color: #eee;
 }
 
@@ -29 +29 @@
     margin-left: 10px;
 }
+
+#options {
+    position: absolute;
+    top: 0;
+    right: 0;
+}
 </style>
 
@@ -48 +54 @@
 }
 
-var html = 'Tests where results did not match expected results:';
+var html = '<p>Tests where results did not match expected results:</p>';
 
 if (results.uses_expectations_file)
-    html += '<label><input class="unexpected-results" type=checkbox checked>Only show unexpected results</label>';
-
-html += '<table><thead><tr>' +
+    html += '<div id=options><label><input class="unexpected-results" type=checkbox checked>Only show unexpected results</label></div>';
+
+html += '<table id="results-table"><thead><tr>' +
         '<th>test</th>' +
         '<th id="text-results-header">text results</th>' +
@@ -64 +70 @@
 html += '</tr></thead>';
 
-var test_base_path;
-if (results.layout_tests_dir && location.toString().indexOf('file://') != 0)
-    test_base_path = results.layout_tests_dir + '/';
-else
-    test_base_path = 'http://trac.webkit.org/browser/trunk/LayoutTests/';
+function testLink(test)
+{
+    var test_base_path;
+    if (results.layout_tests_dir && location.toString().indexOf('file://') != 0)
+        test_base_path = results.layout_tests_dir + '/';
+    else
+        test_base_path = 'http://trac.webkit.org/browser/trunk/LayoutTests/';
+    return '<a href="' + test_base_path + test + '">' + test + '</a>';
+}
 
 function resultLink(test_prefix, suffix, contents)
@@ -77 +87 @@
 // FIXME: show expected/actual/diff contents inline in iframes
 // FIXME: allow zooming in on pixel diffs
-// FIXME: store stderr information in the json
-// FIXME: add links to the httpd access/error logs
 // FIXME: handle new tests
 
@@ -85 +93 @@
 
 html += '<tbody>';
+
+var testsWithStderr = [];
+var hasHttpTests = false;
+
 for (var test in results.tests) {
+  if (results.tests[test].has_stderr)
+      testsWithStderr.push(test);
+
+  hasHttpTests = hasHttpTests || test.indexOf('http/') == 0;
+
   var actual = results.tests[test].actual;
   var expected = results.tests[test].expected || 'PASS';
@@ -92 +109 @@
     continue;
 
-  var row = '<td><a href="' + test_base_path + test + '">' + test + '</a></td>';
+  var row = '<td>' + testLink(test) + '</td>';
   var test_prefix = stripExtension(test);
 
@@ -122 +139 @@
 
   row += '</td>';
-  // FIXME: Handle stderr output.
   row += '<td>' + actual + '</td>';
   
@@ -133 +149 @@
 
 html += '</tbody></table>'
+
+if (testsWithStderr.length) {
+    testsWithStderr.sort();
+
+    html += '<p>Tests that had stderr output:</p><table id="stderr-table">';
+    for (var i = 0; i < testsWithStderr.length; i++) {
+        var test = testsWithStderr[i];
+        html += '<tr><td>' + testLink(test) + '</td>' +
+            '<td>' + resultLink(stripExtension(test), '-stderr.txt', 'stderr') + '</td></tr>';
+    }
+    html += '</table>'
+}
+
+if (hasHttpTests) {
+    html += '<p>httpd access log: <a href="access_log.txt">access_log.txt</a></p>' +
+        '<p>httpd error log: <a href="error_log.txt">error_log.txt</a></p>';
+}
+
 document.write(html);
 
@@ -179 +213 @@
 TableSorter._sortRows = function(newHeader, reversed)
 {
-    var testsTable = document.querySelector('table');
+    var testsTable = document.querySelector('#results-table');
     var headers = toArray(testsTable.querySelectorAll('th'));
     var sortColumn = headers.indexOf(newHeader);
@@ -212 +246 @@
 TableSorter.sortColumn = function(columnNumber)
 {
-    var newHeader = document.querySelector('table').querySelectorAll('th')[columnNumber];
+    var newHeader = document.querySelector('#results-table').querySelectorAll('th')[columnNumber];
     TableSorter._sort(newHeader);
 }
@@ -235 +269 @@
 }
 
-document.querySelector('table').addEventListener('click', TableSorter.handleClick, false);
+document.querySelector('#results-table').addEventListener('click', TableSorter.handleClick, false);
 TableSorter.sortColumn(0);
 

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

@@ -146 +146 @@
         tests[test]['expected'] = expected
         tests[test]['actual'] = " ".join(actual)
+        # FIXME: Set this correctly once https://webkit.org/b/37739 is fixed.
+        tests[test]['has_stderr'] = False
 
         if filename in test_timings_map: