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

[Daniel Dunbar]

Author: ddunbar
Date: Thu Feb 23 18:58:04 2012
New Revision: 151325

URL: http://llvm.org/viewvc/llvm-project?rev=151325&view=rev
Log:
[lnt] lnt.server.reporting: Drop machine name from report table, just make sure to report when comparison crosses machines.
 - Also, change end time field to be duration instead, which is more useful and readable.

Modified:
    zorg/trunk/lnt/lnt/server/reporting/runs.py
    zorg/trunk/lnt/lnt/server/ui/templates/v4_machine.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=151325&r1=151324&r2=151325&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/server/reporting/runs.py (original)
+++ zorg/trunk/lnt/lnt/server/reporting/runs.py Thu Feb 23 18:58:04 2012
@@ -149,42 +149,41 @@
     <th>Run</th>
     <th>Order</th>
     <th>Start Time</th>
-    <th>End Time</th>
-    <th>Machine</th>
+    <th>Duration</th>
   </tr>"""
     # FIXME: Remove hard coded field use here.
     print >>html_report, """\
 <tr><td><a href="%s/%d">Current</a></td>\
-<td>%s</td><td>%s</td><td>%s</td>\
-<td>%s:%d</td></tr>""" % (
+<td>%s</td><td>%s</td><td>%s</td></tr>""" % (
         ts_url, run.id, run.order.llvm_project_revision,
-        run.start_time, run.end_time, run.machine.name, run.machine.id)
+        run.start_time, run.end_time - run.start_time)
     if compare_to:
         # FIXME: Remove hard coded field use here.
         print >>html_report, """\
 <tr><td><a href="%s/%d">Previous</a></td>\
-<td>%s</td><td>%s</td><td>%s</td>\
-<td>%s:%d</td></tr>""" % (
+<td>%s</td><td>%s</td><td>%s</td></tr>""" % (
             ts_url, compare_to.id, compare_to.order.llvm_project_revision,
-            compare_to.start_time, compare_to.end_time, compare_to.machine.name,
-            compare_to.machine.id)
+            compare_to.start_time, compare_to.end_time - compare_to.start_time)
     else:
         print >>html_report, """<tr><td colspan=4>No Previous Run</td></tr>"""
     if baseline:
         # FIXME: Remove hard coded field use here.
         print >>html_report, """\
 <tr><td><a href="%s/%d">Baseline</a></td>\
-<td>%s</td><td>%s</td><td>%s</td>\
-<td>%s:%d</td></tr>""" % (
+<td>%s</td><td>%s</td><td>%s</td></tr>""" % (
             ts_url, baseline.id, baseline.order.llvm_project_revision,
-            baseline.start_time, baseline.end_time, baseline.machine.name,
-            baseline.machine.id)
+            baseline.start_time, baseline.end_time - baseline.start_time)
     print >>html_report, """</table>"""
     if compare_to and run.machine != compare_to.machine:
         print >>html_report, """<p><b>*** WARNING ***:""",
         print >>html_report, """comparison is against a different machine""",
         print >>html_report, """(%s:%d)</b></p>""" % (compare_to.machine.name,
                                                       compare_to.machine.id)
+    if baseline and run.machine != baseline.machine:
+        print >>html_report, """<p><b>*** WARNING ***:""",
+        print >>html_report, """baseline is against a different machine""",
+        print >>html_report, """(%s:%d)</b></p>""" % (baseline.machine.name,
+                                                      baseline.machine.id)
 
     # Generate the summary of the changes.
     num_total_changes = sum(len(bucket)

Modified: zorg/trunk/lnt/lnt/server/ui/templates/v4_machine.html
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/server/ui/templates/v4_machine.html?rev=151325&r1=151324&r2=151325&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/server/ui/templates/v4_machine.html (original)
+++ zorg/trunk/lnt/lnt/server/ui/templates/v4_machine.html Thu Feb 23 18:58:04 2012
@@ -4,7 +4,7 @@
 {% set machine = ts.getMachine(id) %}
 
 {% extends "layout.html" %}{
-% set components = [(testsuite_name, v4_url_for("v4_overview"))] %}
+{% set components = [(testsuite_name, v4_url_for("v4_overview"))] %}
 {% block head %}
         <script src="{{ url_for('.static', filename='popup.js') }}"></script>
 {% endblock %}