X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=resources%2Ftools%2Fpresentation%2Fgenerator_tables.py;h=22d8ea697e7ab8c49afb989ca0118536718d1262;hb=936e3c5f192cac6666f1f60919c990648ebeb80b;hp=58d3b67b555095d835abbfbb3ad5a041b8e5064a;hpb=c01120c62b3d3649a5c7e6962c077b88c5512622;p=csit.git

diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index 58d3b67b55..22d8ea697e 100644
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -195,6 +195,9 @@ def table_performance_improvements(table, input_data):
         for item in data:
             if isinstance(item["data"], str):
                 line_lst.append(item["data"])
+                # Remove -?drdisc from the end
+                if item["data"].endswith("drdisc"):
+                    item["data"] = item["data"][:-8]
             elif isinstance(item["data"], float):
                 line_lst.append("{:.1f}".format(item["data"]))
             elif item["data"] is None:
@@ -345,8 +348,12 @@ def table_performance_comparison(table, input_data):
     :type input_data: InputData
     """
 
+    logging.info("  Generating the table {0} ...".
+                 format(table.get("title", "")))
+
     # Transform the data
     data = input_data.filter_data(table)
+    logging.info(data)
 
     # Prepare the header of the tables
     try:
@@ -374,14 +381,22 @@ def table_performance_comparison(table, input_data):
                     tbl_dict[tst_name] = {"name": name,
                                           "ref-data": list(),
                                           "cmp-data": list()}
-                tbl_dict[tst_name]["ref-data"].\
-                    append(tst_data["throughput"]["value"])
+                try:
+                    tbl_dict[tst_name]["ref-data"].\
+                        append(tst_data["throughput"]["value"])
+                except TypeError:
+                    pass  # No data in output.xml for this test
 
     for job, builds in table["compare"]["data"].items():
         for build in builds:
             for tst_name, tst_data in data[job][str(build)].iteritems():
-                tbl_dict[tst_name]["cmp-data"].\
-                    append(tst_data["throughput"]["value"])
+                try:
+                    tbl_dict[tst_name]["cmp-data"].\
+                        append(tst_data["throughput"]["value"])
+                except KeyError:
+                    pass
+                except TypeError:
+                    tbl_dict.pop(tst_name, None)
 
     tbl_lst = list()
     for tst_name in tbl_dict.keys():
@@ -424,6 +439,7 @@ def table_performance_comparison(table, input_data):
                                                table["output-file-ext"])
                  ]
     for file_name in tbl_names:
+        logging.info("      Writing file: '{}'".format(file_name))
         with open(file_name, "w") as file_handler:
             file_handler.write(header_str)
             for test in tbl_lst:
@@ -444,6 +460,7 @@ def table_performance_comparison(table, input_data):
 
     for i, txt_name in enumerate(tbl_names_txt):
         txt_table = None
+        logging.info("      Writing file: '{}'".format(txt_name))
         with open(tbl_names[i], 'rb') as csv_file:
             csv_content = csv.reader(csv_file, delimiter=',', quotechar='"')
             for row in csv_content:
@@ -464,6 +481,7 @@ def table_performance_comparison(table, input_data):
 
     output_file = "{0}-ndr-1t1c-top{1}".format(table["output-file"],
                                                table["output-file-ext"])
+    logging.info("      Writing file: '{}'".format(output_file))
     with open(output_file, "w") as out_file:
         out_file.write(header_str)
         for i, line in enumerate(lines[1:]):
@@ -473,6 +491,7 @@ def table_performance_comparison(table, input_data):
 
     output_file = "{0}-ndr-1t1c-bottom{1}".format(table["output-file"],
                                                   table["output-file-ext"])
+    logging.info("      Writing file: '{}'".format(output_file))
     with open(output_file, "w") as out_file:
         out_file.write(header_str)
         for i, line in enumerate(lines[-1:0:-1]):
@@ -489,6 +508,7 @@ def table_performance_comparison(table, input_data):
 
     output_file = "{0}-pdr-1t1c-top{1}".format(table["output-file"],
                                                table["output-file-ext"])
+    logging.info("      Writing file: '{}'".format(output_file))
     with open(output_file, "w") as out_file:
         out_file.write(header_str)
         for i, line in enumerate(lines[1:]):
@@ -498,6 +518,7 @@ def table_performance_comparison(table, input_data):
 
     output_file = "{0}-pdr-1t1c-bottom{1}".format(table["output-file"],
                                                   table["output-file-ext"])
+    logging.info("      Writing file: '{}'".format(output_file))
     with open(output_file, "w") as out_file:
         out_file.write(header_str)
         for i, line in enumerate(lines[-1:0:-1]):