[llvm-commits] [zorg] r148008 - in /zorg/trunk/lnt/lnt: lnttool/import_data.py util/ImportData.py

[Daniel Dunbar]

Author: ddunbar
Date: Wed Jan 11 19:53:45 2012
New Revision: 148008

URL: http://llvm.org/viewvc/llvm-project?rev=148008&view=rev
Log:
[lnt] lnt import: Add a --no-report option, useful for speeding up large batch
imports.

Modified:
    zorg/trunk/lnt/lnt/lnttool/import_data.py
    zorg/trunk/lnt/lnt/util/ImportData.py

Modified: zorg/trunk/lnt/lnt/lnttool/import_data.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/lnttool/import_data.py?rev=148008&r1=148007&r2=148008&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/lnttool/import_data.py (original)
+++ zorg/trunk/lnt/lnt/lnttool/import_data.py Wed Jan 11 19:53:45 2012
@@ -28,7 +28,9 @@
     parser.add_option("-v", "--verbose", dest="verbose",
                       help="show verbose test results",
                       action="store_true", default=False)
-    parser.add_option("", "--no-email", dest="noEmail",
+    parser.add_option("", "--no-email", dest="no_email",
+                      action="store_true", default=False)
+    parser.add_option("", "--no-report", dest="no_report",
                       action="store_true", default=False)
     (opts, args) = parser.parse_args(args)
 
@@ -57,7 +59,7 @@
         result = lnt.util.ImportData.import_and_report(
             config, opts.database, db, file,
             opts.format, opts.commit, opts.show_sample_count,
-            opts.noEmail)
+            opts.no_email, opts.no_report)
 
         success &= result.get('success', False)
         if opts.show_raw_result:

Modified: zorg/trunk/lnt/lnt/util/ImportData.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/util/ImportData.py?rev=148008&r1=148007&r2=148008&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/util/ImportData.py (original)
+++ zorg/trunk/lnt/lnt/util/ImportData.py Wed Jan 11 19:53:45 2012
@@ -6,7 +6,8 @@
 from lnt.util import NTEmailReport
 
 def import_and_report(config, db_name, db, file, format, commit=False,
-                      show_sample_count=False, disable_email=False):
+                      show_sample_count=False, disable_email=False,
+                      disable_report=False):
     """
     import_and_report(config, db_name, db, file, format,
                       [commit], [show_sample_count],
@@ -88,8 +89,9 @@
         report_url = "%s/db_%s/" % (config.zorgURL, db_name)
     else:
         report_url = 'localhost'
-    NTEmailReport.emailReport(result, db, run, report_url,
-                              email_config, toAddress, success, commit)
+    if not disable_report:
+        NTEmailReport.emailReport(result, db, run, report_url,
+                                  email_config, toAddress, success, commit)
 
     result['added_machines'] = db.getNumMachines() - numMachines
     result['added_runs'] = db.getNumRuns() - numRuns
@@ -120,7 +122,8 @@
         # Perform the shadow import.
         shadow_result = import_and_report(config, shadow_name,
                                           shadow_db, file, format, commit,
-                                          show_sample_count, disable_email)
+                                          show_sample_count, disable_email,
+                                          disable_report)
 
         # Append the shadow result to the result.
         result['shadow_result'] = shadow_result