[llvm-commits] [zorg] r151327 - in /zorg/trunk/lnt/lnt/server: reporting/runs.py ui/templates/v4_run.html

[Daniel Dunbar]

Author: ddunbar
Date: Thu Feb 23 18:58:10 2012
New Revision: 151327

URL: http://llvm.org/viewvc/llvm-project?rev=151327&view=rev
Log:
[lnt] lnt.server.reporting: Fix up a few details in the text report (which I am likely to get fed up with and remove support for soon).
 - In fact, I went ahead and removed it from the v4_run page.

Modified:
    zorg/trunk/lnt/lnt/server/reporting/runs.py
    zorg/trunk/lnt/lnt/server/ui/templates/v4_run.html

Modified: zorg/trunk/lnt/lnt/server/reporting/runs.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/server/reporting/runs.py?rev=151327&r1=151326&r2=151327&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/server/reporting/runs.py (original)
+++ zorg/trunk/lnt/lnt/server/reporting/runs.py Thu Feb 23 18:58:10 2012
@@ -207,14 +207,18 @@
         else:
             num_items_vs_baseline = None
         if num_items or num_items_vs_baseline:
+            if baseline:
+                print >>report, '%s: %d (%d on baseline)' % (
+                    name, num_items, num_items_vs_baseline)
+            else:
                 print >>report, '%s: %d' % (name, num_items)
-                print >>html_report, """
+            print >>html_report, """
 <tr><td>%s</td><td align="right">%d</td>""" % (
-                    name, num_items)
-                if baseline:
-                    print >>html_report, """<td align="right">%d</td>""" % (
-                        num_items_vs_baseline)
-                print >>html_report, """</tr>"""
+                name, num_items)
+            if baseline:
+                print >>html_report, """<td align="right">%d</td>""" % (
+                    num_items_vs_baseline)
+            print >>html_report, """</tr>"""
     print >>report, """Total Tests: %d""" % num_total_tests
     print >>report
     print >>html_report, """

Modified: zorg/trunk/lnt/lnt/server/ui/templates/v4_run.html
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/server/ui/templates/v4_run.html?rev=151327&r1=151326&r2=151327&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/server/ui/templates/v4_run.html (original)
+++ zorg/trunk/lnt/lnt/server/ui/templates/v4_run.html Thu Feb 23 18:58:10 2012
@@ -3,6 +3,7 @@
 
 {% set run = request_info.run %}
 {% set compare_to = request_info.compare_to %}
+{% set baseline = request_info.baseline %}
 {% set ts = request_info.ts %}
 {% set machine = run.machine %}
 
@@ -136,17 +137,16 @@
 {% if compare_to %}
 <input type="hidden" name="compare_to" value="{{compare_to.id}}">
 {% endif %}
+{% if baseline %}
+<input type="hidden" name="baseline" value="{{baseline.id}}">
+{% endif %}
 
 <input type="submit" name="submit" value="Update">
 </form>
 
 {{ utils.render_popup_end() }}
 
-{{ utils.render_popup_begin('text_report', 'Report (Text)', true) }}
-<pre>{{ request_info.text_report }}</pre>
-{{ utils.render_popup_end() }}
-
-{{ utils.render_popup_begin('html_report', 'Report (HTML)',
+{{ utils.render_popup_begin('html_report', 'Report',
                             options.hide_report_by_default) }}
 {{request_info.html_report|safe}}
 {{ utils.render_popup_end() }}