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

ojanvafai · ojanvafai · commit 4e08670077ef · 2011-04-15T23:59:57.000Z
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: Canonical link: https://commits.webkit.org/73795@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@84054 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+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>
 
         Reviewed by Antonio Gomes.
diff --git a/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results.html b/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results.html
@@ -77,6 +77,8 @@
 // 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
 
 var hasTextFailures = false;
 var hasImageFailures = false;
@@ -93,26 +95,29 @@
   var test_prefix = stripExtension(test);
 
   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');
   }
 
   row += '</td><td>';
 
   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');
   }
 
   row += '</td>';
diff --git a/Tools/Scripts/webkitpy/layout_tests/layout_package/test_runner.py b/Tools/Scripts/webkitpy/layout_tests/layout_package/test_runner.py
@@ -158,6 +158,8 @@ def summarize_results(port_obj, expectations, result_summary, retry_summary, tes
     # we should make this check more robust.
     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
 
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/base.py b/Tools/Scripts/webkitpy/layout_tests/port/base.py
@@ -140,6 +140,12 @@ def __init__(self, port_name=None, options=None,
         self._multiprocessing_is_available = (multiprocessing is not None)
         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
         port."""
