Updates to make index.html easier to read

Author: TimSVector

VERSION.txt

@@ -1 +1 @@
-v2025.07.07-1412-0400-g2ecf9f2
+v2025.08.15-1525-0400-g368d32c

create_index_html.py

@@ -16,42 +16,71 @@ def __enter__(self):
     def __exit__(self, etype, value, traceback):
         os.chdir(self.savedPath)
 
+def searchKeyword(search_string, filename):
+    with open(filename, "r") as f:
+        for line_number, line in enumerate(f, start=1):
+            if search_string in line:
+                start_idx = line.find(search_string)
+                if start_idx != -1: 
+                    start_idx += len(search_string)
+                    
+                end_idx = line[start_idx:].find("<")
+                
+                if end_idx != -1: 
+                    end_idx += start_idx
+
+                return line_number, start_idx, end_idx, line
+                
+    return -1, -1, -1, line  # not found
+
+def getEnvName(search_string, filename):
+    report_name = None
+    line_number, start_idx, end_idx, line = searchKeyword("<tr><th>Environment Name</th><td>",filename)
+    
+    if line_number == -1:
+        env_name = None
+    else:
+        env_name = line[start_idx:end_idx]
+        
+    return env_name
+
 def getReportName(filename):
 
     reportName = filename
     reportType = 0
 
-    if "aggregate" in filename:
-        manageProject = filename.split("_aggregate",1)[0]
-        reportName = "Aggregate Coverage Report"
+    if searchKeyword(">Aggregate Coverage Report<", filename)[0] != -1:
+        env_name = getEnvName("<tr><th>Environment Name</th><td>",filename)
+        if env_name == None:
+            reportName = "Aggregate Coverage Report"
+        else:
+            reportName = f"Aggregate Coverage Report {env_name}"
+            reportType = 1
 
-    elif "full_status" in filename:
-        manageProject = filename.split("_aggregate",1)[0]
+    elif searchKeyword(">Full Status Section<", filename)[0] != -1:
         reportName = "Full Status Report"
 
-    elif "environment" in filename:
-        manageProject = filename.split("_environment",1)[0]
-        reportName = "Environment Report"
-        
-    elif "manage_incremental_rebuild_report" in filename:
-        manageProject = filename.split("_manage_incremental_rebuild_report",1)[0]
+    elif searchKeyword("Manage Incremental Rebuild Report", filename)[0] != -1:
         reportName = "Incremental Report Report"
 
-    elif "metrics" in filename:
-        manageProject = filename.split("_metrics",1)[0]
+    elif searchKeyword(">Metrics Report<", filename)[0] != -1:
         reportName = "Metrics Report"
 
-    elif "html_reports" in filename:
-        ## html_reports/VectorCAST_MinGW_C++_UnitTesting_ENV_LINKED_LIST.html
-        comp_ts_env = filename.replace("html_reports/","").replace(".html","")
-        reportName = comp_ts_env 
+    elif searchKeyword(">Test Case Summary Report<", filename)[0] != -1:
+        reportName = "System Test Status Report"
+    
+    elif searchKeyword(">PC-Lint Plus Results<", filename)[0] != -1:
+        reportName = "PC-Lint Plus Results"
+    
+    elif searchKeyword(">PC-Lint Plus Results<", filename)[0] != -1:
+        reportName = "PC-Lint Plus Results"
+    
+    elif searchKeyword(">Full Report<", filename)[0] != -1:
+        reportName = "Full Report "
+        reportName += getEnvName("<tr><th>Environment Name</th><td>",filename)
+        
         reportType = 1
 
-    elif "management" in filename:
-        comp_ts_env = filename.replace("management/","").replace(".html","")
-        reportName = comp_ts_env 
-        reportType = 3
-
     else:
         reportType = 2
 

vcast_exec.py

@@ -393,6 +393,32 @@ def generateTestCaseMgtRpt(self):
         else:
             print("Cannot create Test Case Management HTML report. Please upgrade VectorCAST")
 
+
+    def generateUtFullReport(self):
+        if not os.path.exists(os.path.join(self.output_dir, "management")):
+            os.makedirs(os.path.join(self.output_dir, "management"))
+        else:
+            for file in glob.glob(os.path.join(self.output_dir, "management","*_full_report.html")):
+                os.remove(file)
+                
+        if checkVectorCASTVersion(21):
+            print("Creating Unit Test Case Full Report")
+            from vector.apps.DataAPI.vcproject_api import VCProjectApi
+                                   
+            with VCProjectApi(self.FullMP) as vcprojApi:
+                for env in vcprojApi.Environment.all():
+                    if not env.is_active:
+                        continue
+                            
+                    self.needIndexHtml = True
+                    
+                    report_name = env.compiler.name + "_" + env.testsuite.name + "_" + env.name + "_full_report.html"
+                    report_name = os.path.join(self.output_dir, "management",report_name)
+                    print(f"Creating Full Report HTML report for {env.name} in {report_name}")
+                    env.api.report(report_type="FULL_REPORT", formats=["HTML"], output_file=report_name)
+        else:
+            print("Cannot create Test Case Management HTML report. Please upgrade VectorCAST")
+
 
     def exportRgw(self):
         print("Creating RGW Exports")
@@ -479,7 +505,9 @@ def runExec(self):
     reportGroup.add_argument('--aggregate', help='Generate aggregate coverage report VectorCAST Project', action="store_true", default = False)
     reportGroup.add_argument('--metrics', help='Generate metrics reports for VectorCAST Project', action="store_true", default = False)
     reportGroup.add_argument('--fullstatus', help='Generate full status reports for VectorCAST Project', action="store_true", default = False)
+    reportGroup.add_argument('--utfull', help='Generate Full Reports for each VectorCAST environment in project', action="store_true", default = False)
     reportGroup.add_argument('--tcmr', help='Generate Test Cases Management Reports for each VectorCAST environment in project', action="store_true", default = False)
+    reportGroup.add_argument('--index', help='Generate an index.html report that ties all the other HTML reports together', action="store_true", default = False)
 
     beGroup = parser.add_argument_group('Build/Execution Options', 'Options that effect build/execute operation')
 
@@ -550,7 +578,10 @@ def runExec(self):
     if args.tcmr:
         vcExec.generateTestCaseMgtRpt()
 
-    if vcExec.needIndexHtml:
+    if args.utfull:
+        vcExec.generateUtFullReport()
+
+    if vcExec.needIndexHtml or args.index:
         vcExec.generateIndexHtml()
 
     if args.export_rgw: