[llvm-commits] [LNT] r155713 - in /lnt/trunk/lnt/server: reporting/summaryreport.py ui/views.py

[Daniel Dunbar]

Author: ddunbar
Date: Fri Apr 27 11:06:16 2012
New Revision: 155713

URL: http://llvm.org/viewvc/llvm-project?rev=155713&view=rev
Log:
[Summary Report] Add a list of exact machine names (instead of patterns).

Modified:
    lnt/trunk/lnt/server/reporting/summaryreport.py
    lnt/trunk/lnt/server/ui/views.py

Modified: lnt/trunk/lnt/server/reporting/summaryreport.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/reporting/summaryreport.py?rev=155713&r1=155712&r2=155713&view=diff
==============================================================================
--- lnt/trunk/lnt/server/reporting/summaryreport.py (original)
+++ lnt/trunk/lnt/server/reporting/summaryreport.py Fri Apr 27 11:06:16 2012
@@ -83,12 +83,13 @@
 ###
 
 class SummaryReport(object):
-    def __init__(self, db, report_orders, report_machine_patterns,
-                 machines_to_merge):
+    def __init__(self, db, report_orders, report_machine_names,
+                 report_machine_patterns, machines_to_merge):
         self.db = db
         self.testsuites = list(db.testsuite.values())
         self.report_orders = list((name,orders)
                                   for name,orders in report_orders)
+        self.report_machine_names = set(report_machine_names)
         self.report_machine_patterns = list(report_machine_patterns)
         self.report_machine_rexes = [
             re.compile(pattern)
@@ -106,6 +107,8 @@
         # Build a per-testsuite list of the machines that match the specified
         # patterns.
         def should_be_in_report(machine):
+            if machine.name in self.report_machine_names:
+                return True
             for rex in self.report_machine_rexes:
                 if rex.match(machine.name):
                     return True

Modified: lnt/trunk/lnt/server/ui/views.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/views.py?rev=155713&r1=155712&r2=155713&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/views.py (original)
+++ lnt/trunk/lnt/server/ui/views.py Fri Apr 27 11:06:16 2012
@@ -1091,7 +1091,8 @@
 
     # Create the report object.
     report = lnt.server.reporting.summaryreport.SummaryReport(
-        request.get_db(), config['orders'], config['machine_patterns'],
+        request.get_db(), config['orders'], config['machine_names'],
+        config['machine_patterns'],
         dict((int(key),value)
              for key,value in config['machines_to_merge'].items()))