]> git.donarmstrong.com Git - lilypond.git/commitdiff
projects / lilypond.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cf93b1d)
Issue 2014: Improve HTML output of regression tests
authorAdam Spiers <lilypond@adamspiers.org>
Thu, 3 Nov 2011 00:31:13 +0000 (00:31 +0000)
committerAdam Spiers <lilypond@adamspiers.org>
Mon, 28 Nov 2011 16:16:40 +0000 (16:16 +0000)
- Use Javascript to enable filtering of table rows by type
- Make sure git file compare cell contents are HTML-escaped
- Fix some HTML validation issues

scripts/build/output-distance.py [changed mode: 0644->0755] patch | blob | history

diff --git a/scripts/build/output-distance.py b/scripts/build/output-distance.py
old mode 100644 (file)
new mode 100755 (executable)
index b90bda5..d2d55d7
--- a/scripts/build/output-distance.py
+++ b/scripts/build/output-distance.py
@@ -5,6 +5,8 @@ import os
 import math
 import re
 
+import cgi
+
 ## so we can call directly as scripts/build/output-distance.py
 me_path = os.path.abspath (os.path.split (sys.argv[0])[0])
 sys.path.insert (0, me_path + '/../python/')
@@ -457,7 +459,7 @@ class GitFileCompareLink (FileCompareLink):
         str = '\n'.join ([l[:80] for l in str.split ('\n')])
 
 
-        str = '<font size="-2"><pre>%s</pre></font>' % str
+        str = '<font size="-2"><pre>%s</pre></font>' % cgi.escape (str)
         return str
 
     def calc_distance (self):
@@ -942,33 +944,70 @@ class ComparisonData:
         (changed, below, unchanged) = self.thresholded_results (threshold)
 
 
-        html = ''
+        table_rows = ''
         old_prefix = os.path.split (dir1)[1]
         for link in changed:
-            html += link.html_record_string (dest_dir)
+            table_rows += link.html_record_string (dest_dir)
 
 
         short_dir1 = shorten_string (dir1)
         short_dir2 = shorten_string (dir2)
+
+        summary = ''
+        below_count = len (below)
+
+        if below_count:
+            summary += '<p>%d below threshold</p>' % below_count
+
+        summary += '<p>%d unchanged</p>' % len (unchanged)
+
         html = '''<html>
+<head>
+<title>LilyPond regression test results</title>
+<script language="javascript" type="text/javascript">
+// <![CDATA[
+    var rows = document.getElementsByTagName("tr");
+    function showOnlyMatchingRows(substring) {
+        var rowcount = rows.length;
+        for (var i = 0; i < rowcount; i++) {
+            row = rows[i];
+            html = row.innerHTML;
+            row.style.display =
+                (html.indexOf(substring + '">') != -1) ? "" : "none";
+        }
+    }
+// ]]>
+</script>
+</head>
+<body>
+<p>
+  click to filter rows by type:
+  <a href="#" onClick="showOnlyMatchingRows('.ly')">ly</a> /
+  <a href="#" onClick="showOnlyMatchingRows('.profile')">profiling</a> /
+  <a href="#" onClick="showOnlyMatchingRows('.signature')">signature</a> /
+  <a href="#" onClick="showOnlyMatchingRows('.midi')">midi</a> /
+  <a href="#" onClick="showOnlyMatchingRows('.log')">log</a> /
+  <a href="#" onClick="showOnlyMatchingRows('.gittxt')">gittxt</a> /
+  <a href="#" onClick="showOnlyMatchingRows('')">reset to all</a>
+</p>
+
+<hr />
+
+%(summary)s
+
+<hr />
+
 <table rules="rows" border bordercolor="blue">
 <tr>
 <th>distance</th>
 <th>%(short_dir1)s</th>
 <th>%(short_dir2)s</th>
 </tr>
-%(html)s
+%(table_rows)s
 </table>
+</body>
 </html>''' % locals()
 
-        html += ('<p>')
-        below_count = len (below)
-
-        if below_count:
-            html += ('<p>%d below threshold</p>' % below_count)
-
-        html += ('<p>%d unchanged</p>' % len (unchanged))
-
         dest_file = dest_dir + '/index.html'
         open_write_file (dest_file).write (html)
 
@@ -1262,7 +1301,7 @@ def main ():
         run_tests ()
         sys.exit (0)
 
-    if len (args) % 2:
+    if len (args) % 2 == 1:
         p.print_usage ()
         sys.exit (2)
 
Debian packaging of lilypond