Changeset 84054 in webkit

Timestamp:

Apr 15, 2011 4:59:57 PM (13 years ago)

Author:

ojan@chromium.org

Message:

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

Reviewed by Eric Seidel.

only show pretty-diff/wdiff if they were generated
​https://bugs.webkit.org/show_bug.cgi?id=58682

• Scripts/webkitpy/layout_tests/layout_package/json_results.html:
• Scripts/webkitpy/layout_tests/layout_package/test_runner.py:
• Scripts/webkitpy/layout_tests/port/base.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)
• Scripts/webkitpy/layout_tests/port/base.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-15  Ojan Vafai  <ojan@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        only show pretty-diff/wdiff if they were generated
+        https://bugs.webkit.org/show_bug.cgi?id=58682
+
+        * Scripts/webkitpy/layout_tests/layout_package/json_results.html:
+        * Scripts/webkitpy/layout_tests/layout_package/test_runner.py:
+        * Scripts/webkitpy/layout_tests/port/base.py:
+
 2011-04-15  Andreas Kling  <kling@webkit.org>
 

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

@@ -78 +78 @@
 // 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
 
 var hasTextFailures = false;
@@ -94 +96 @@
 
   row += '<td>';
-  // FIXME: only include timeout actual/expected results here if we actually spit out results for timeout tests.
   if (actual == 'CRASH')
-      row += resultLink(test, '-stack.txt', 'stack');
+      row += resultLink(test_prefix, '-stack.txt', 'stack');
   else if (actual.indexOf('TEXT' || actual == 'TIMEOUT') != -1) {
+      // FIXME: only include timeout actual/expected results here if we actually spit out results for timeout tests.
       hasTextFailures = true;
-      // FIXME: Show wdiff here too?
-      // FIXME: store a bit in the JSON as to whether pretty-diff/wdiffs were generated
-      row += resultLink(test, '-expected.txt', 'expected') +
-          resultLink(test, '-actual.txt', 'actual') +
-          resultLink(test, '-diff.txt', 'diff') +
-          resultLink(test, '-pretty-diff.html', 'pretty diff');
+      row += resultLink(test_prefix, '-expected.txt', 'expected') +
+          resultLink(test_prefix, '-actual.txt', 'actual') +
+          resultLink(test_prefix, '-diff.txt', 'diff');
+        
+      if (results.has_pretty_patch)
+          row += resultLink(test_prefix, '-pretty-diff.html', 'pretty diff');
+
+      if (results.has_wdiff)
+          row += resultLink(test_prefix, '-wdiff.html', 'wdiff');
   }
 
@@ -111 +116 @@
   if (actual.indexOf('IMAGE') != -1) {
       hasImageFailures = true;
-      row += resultLink(test, '-expected.png', 'expected') +
-          resultLink(test, '-actual.png', 'actual') +
-          resultLink(test, '-diff.png', 'diff');
+      row += resultLink(test_prefix, '-expected.png', 'expected') +
+          resultLink(test_prefix, '-actual.png', 'actual') +
+          resultLink(test_prefix, '-diff.png', 'diff');
   }
 

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

@@ -159 +159 @@
     results['uses_expectations_file'] = port_obj.name().find('chromium') != -1
     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()
 
     return results

trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py

@@ -141 +141 @@
         self._results_directory = None
 
+    def wdiff_available(self):
+        return bool(self._wdiff_available)
+
+    def pretty_patch_available(self):
+        return bool(self._pretty_patch_available)
+
     def default_child_processes(self):
         """Return the number of DumpRenderTree instances to use for this