CSIT-1488: Add data to the Report 1904

[csit.git] / resources / tools / presentation / generator_files.py

diff --git a/resources/tools/presentation/generator_files.py b/resources/tools/presentation/generator_files.py
index e2bcf78..ee2fc12 100644 (file)
--- a/resources/tools/presentation/generator_files.py
+++ b/resources/tools/presentation/generator_files.py
@@ -106,22 +106,30 @@ def file_test_results(file_spec, input_data):
     with open(file_name, "w") as file_handler:
         file_handler.write(rst_header)
         for suite_longname, suite in suites.iteritems():
-            # TODO: Remove when NDRPDRDISC tests are not used:
-            if "ndrchk" in suite_longname or "pdrchk" in suite_longname:
-                continue
             if len(suite_longname.split(".")) <= file_spec["data-start-level"]:
                 continue
-            file_handler.write("\n{0}\n{1}\n".format(
-                suite["name"], get_rst_title_char(
-                    suite["level"] - file_spec["data-start-level"] - 1) *
-                            len(suite["name"])))
-            file_handler.write("\n{0}\n".format(
-                suite["doc"].replace('|br|', '\n\n -')))
+
+            if not ("-ndrpdr" in suite["name"] or
+                    "-mrr" in suite["name"] or
+                    "-func" in suite["name"] or
+                    "-device" in suite["name"]):
+                file_handler.write("\n{0}\n{1}\n".format(
+                    suite["name"], get_rst_title_char(
+                        suite["level"] - file_spec["data-start-level"] - 1) *
+                                len(suite["name"])))
+
             if _tests_in_suite(suite["name"], tests):
+                file_handler.write("\n{0}\n{1}\n".format(
+                    suite["name"], get_rst_title_char(
+                        suite["level"] - file_spec["data-start-level"] - 1) *
+                                   len(suite["name"])))
+                file_handler.write("\n{0}\n".format(
+                    suite["doc"].replace('|br|', '\n\n -')))
                 for tbl_file in table_lst:
                     if suite["name"] in tbl_file:
                         file_handler.write(
                             RST_INCLUDE_TABLE.format(
                                 file_latex=tbl_file,
                                 file_html=tbl_file.split("/")[-1]))
+
     logging.info("  Done.")