[llvm-commits] [zorg] r107397 - in /zorg/trunk/lnt/lnt/util: ImportData.py NTEmailReport.py

[Daniel Dunbar]

Author: ddunbar
Date: Thu Jul  1 10:27:55 2010
New Revision: 107397

URL: http://llvm.org/viewvc/llvm-project?rev=107397&view=rev
Log:
NT/simple: Change email report to include a (short) list of all the preexisting
failures.

Also, fix link to report on server.

Modified:
    zorg/trunk/lnt/lnt/util/ImportData.py
    zorg/trunk/lnt/lnt/util/NTEmailReport.py

Modified: zorg/trunk/lnt/lnt/util/ImportData.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/util/ImportData.py?rev=107397&r1=107396&r2=107397&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/util/ImportData.py (original)
+++ zorg/trunk/lnt/lnt/util/ImportData.py Thu Jul  1 10:27:55 2010
@@ -71,11 +71,8 @@
 
     if not disable_email and toAddress is not None:
         print >>log, "\nMAILING RESULTS TO: %r\n" % toAddress
-        # FIXME: The url below is wrong, it shouldn't be hardcoded to
-        # nightlytest.
         NTEmailReport.emailReport(db, run,
-                                  "%s/db_%s/nightlytest/" % (config.zorgURL,
-                                                             db_name),
+                                  "%s/db_%s/" % (config.zorgURL, db_name),
                                   email_config.host, email_config.from_address,
                                   toAddress, success, commit)
 

Modified: zorg/trunk/lnt/lnt/util/NTEmailReport.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/util/NTEmailReport.py?rev=107397&r1=107396&r2=107397&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/util/NTEmailReport.py (original)
+++ zorg/trunk/lnt/lnt/util/NTEmailReport.py Thu Jul  1 10:27:55 2010
@@ -132,7 +132,7 @@
     # Generate the report header.
     if baseurl[-1] == '/':
         baseurl = baseurl[:-1]
-    print >>report, """%s/%d/""" % (baseurl, run.id)
+    print >>report, """%s/simple/%s/%d/""" % (baseurl, tag, run.id)
     print >>report, """Nickname: %s:%d""" % (machine.name, machine.number)
     if 'name' in machine.info:
         print >>report, """Name: %s""" % (machine.info['name'].value,)
@@ -204,7 +204,7 @@
                         print >>report, '  %s' % (name,)
 
     # Generate a list of the existing failures.
-    if False and existing_failures:
+    if existing_failures:
         print >>report
         print >>report, """================="""
         print >>report, """Existing Failures"""
@@ -213,8 +213,13 @@
             if pset or len(existing_failures) > 1:
                 print >>report
                 print >>report, "Parameter Set:", pset
-            for name,cr in tests:
+
+            # Print at most 10 failures in an email report.
+            N = 10
+            for name,cr in tests[:N]:
                 print >>report, '  %s' % (name,)
+            if len(tests) > 10:
+                print >>report, '  ... and %d more ...' % (len(tests) - 10,)
 
     return subject, report.getvalue()
 
@@ -335,7 +340,7 @@
 
     if baseurl[-1] == '/':
         baseurl = baseurl[:-1]
-    print >>report, """%s/%d/""" % (baseurl, run.id)
+    print >>report, """%s/nightlytest/%d/""" % (baseurl, run.id)
     print >>report, """Nickname: %s:%d""" % (machine.name, machine.number)
     if 'name' in machine.info:
         print >>report, """Name: %s""" % (machine.info['name'].value,)