.

[SVN r28746]

tools/regression/xsl_reports/test/run.py

@@ -4,32 +4,30 @@ sys.path.append( '..' )
 
 import os
 
-import report
-import merger
+import boost_wide_report
 import utils
 
 
 tag = "CVS-HEAD"
 
 utils.makedirs( "results" )
-    
-all_xml_file = "results/all.xml"
-all_xml_writer = open( all_xml_file, "w" )
-merger.merge_test_runs( ".", tag, all_xml_writer, 1 )
-all_xml_writer.close()
-
-report.make_result_pages( 
-      test_results_file = os.path.abspath( all_xml_file )
-    , expected_results_file = ""
-    , failures_markup_file = os.path.abspath( "explicit-failures-markup.xml" )
-    , tag = tag
-    , run_date = "Today date"
-    , comment_file = os.path.abspath( "comment.html" )
-    , results_dir = "results"
-    , result_prefix = ""
-    , reports = [ "x", "dd" ]
-    , v2 = 1
-    )
 
+boost_wide_report.ftp_task = lambda ftp_site, site_path, incoming_dir: 1
+boost_wide_report.unzip_archives_task = lambda incoming_dir, processed_dir, unzip: 1
 
+    
 
+boost_wide_report.execute_tasks(
+    tag = tag
+    , user = None
+    , run_date = "Today date"
+    , comment_file = os.path.abspath( "comment.html" )
+        , results_dir = os.path.abspath( "results" )
+        , output_dir = os.path.abspath( "output" )
+        , reports = [ "x", "dd" ]
+        , extended_test_results = os.path.abspath( "output/extended_test_results.xml" )
+        , dont_collect_logs = 1
+        , expected_results_file = os.path.abspath( "expected_results.xml" )
+        , failures_markup_file = os.path.abspath( "explicit-failures-markup.xml" )
+        )
+