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

[Daniel Dunbar]

Author: ddunbar
Date: Wed Feb 22 14:37:14 2012
New Revision: 151196

URL: http://llvm.org/viewvc/llvm-project?rev=151196&view=rev
Log:
[lnt] lnt.server.ui.views/run overview: Share the RunInfo analysis object
created by the report generation.

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

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=151196&r1=151195&r2=151196&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/server/reporting/runs.py (original)
+++ zorg/trunk/lnt/lnt/server/reporting/runs.py Wed Feb 22 14:37:14 2012
@@ -252,7 +252,7 @@
   </body>
 </html>""" % locals()
 
-    return subject, report.getvalue(), html_report
+    return subject, report.getvalue(), html_report, sri
 
 def _add_report_changes_detail(ts, test_results, report, html_report,
                                report_url):

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=151196&r1=151195&r2=151196&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/server/ui/templates/v4_run.html (original)
+++ zorg/trunk/lnt/lnt/server/ui/templates/v4_run.html Wed Feb 22 14:37:14 2012
@@ -190,7 +190,7 @@
 </thead>
 
 {% for test_name,test_id in test_info %}
-{%  set cr = sri.get_run_comparison_result(
+{%  set cr = request_info.sri.get_run_comparison_result(
             run, compare_to, test_id, field, comparison_window) %}
 {%  if cr.previous is not none or cr.current is not none %}
 {%    if cr.current is none or cr.current >= test_min_value_filter %}
@@ -227,7 +227,7 @@
 }}{%
   for field in primary_fields
 %}{%
-  set cr = sri.get_run_comparison_result(
+  set cr = request_info.sri.get_run_comparison_result(
             run, compare_to, test_id, field, comparison_window)
 %}	{{cr.previous}}	{{cr.current}}	{{cr.pct_delta}}{%
    endfor %}

Modified: zorg/trunk/lnt/lnt/server/ui/views.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/server/ui/views.py?rev=151196&r1=151195&r2=151196&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/server/ui/views.py (original)
+++ zorg/trunk/lnt/lnt/server/ui/views.py Wed Feb 22 14:37:14 2012
@@ -786,7 +786,7 @@
             self.run, baseurl=db_url_for('index', _external=True),
             only_html_body=only_html_body,
             result=None, compare_to=self.compare_to)
-        _, self.text_report, self.html_report = reports
+        _, self.text_report, self.html_report, self.sri = reports
 
 @v4_route("/<int:id>/report")
 def v4_report(id):
@@ -848,8 +848,6 @@
     test_info = ts.query(ts.Test.name, ts.Test.id).\
         order_by(ts.Test.name).all()
 
-    sri = lnt.server.reporting.analysis.RunInfo(ts)
-
     # Filter the list of tests by name, if requested.
     if test_filter_re:
         test_info = [test
@@ -860,7 +858,7 @@
         "v4_run.html", ts=ts, options=options,
         primary_fields=list(ts.Sample.get_primary_fields()),
         comparison_window=comparison_window,
-        sri=sri, test_info=test_info, runinfo=runinfo,
+        test_info=test_info, runinfo=runinfo,
         test_min_value_filter=test_min_value_filter,
         request_info=info)
 

Modified: zorg/trunk/lnt/lnt/util/NTEmailReport.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/util/NTEmailReport.py?rev=151196&r1=151195&r2=151196&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/util/NTEmailReport.py (original)
+++ zorg/trunk/lnt/lnt/util/NTEmailReport.py Wed Feb 22 14:37:14 2012
@@ -445,9 +445,10 @@
 
     # We haven't implemented V4DB support yet in reports.
     if isinstance(db, lnt.server.db.v4db.V4DB):
-        return lnt.server.reporting.runs.generate_run_report(
+        reports = lnt.server.reporting.runs.generate_run_report(
             run, baseurl=baseurl, only_html_body=only_html_body,
             result=result, compare_to=compare_to)
+        return reports[:2]
 
     # Use a simple report unless the tag indicates this is an old style nightly
     # test run.