Update for generic that is a file with a path

Author: JimLewis

Log2Osvvm.tcl

@@ -214,9 +214,10 @@ namespace eval ::osvvm {
       set GenericNames ""
       if {[regexp {generic} $LineOfLogFile] } {
         set GenericDict [regsub {\].*} [regsub -all {[^\[]*\[generic ([^\]]*)} $LineOfLogFile {\1 }] ""]
-        foreach {name val} $GenericDict {
-          set GenericNames ${GenericNames}_${name}_${val}
-        }
+        set GenericNames [ToGenericNames $GenericDict]
+#        foreach {name val} $GenericDict {
+#          set GenericNames ${GenericNames}_${name}_${val}
+#        }
       }
       if {! $InRunTest} {
         puts $HtmlFileHandle "${PrintPrefix}<details><summary>$LineOfLogFile</summary><span id=\"${LogTestSuiteName}_${LogTestCaseName}${GenericNames}\" />"

OsvvmScriptsCore.tcl

@@ -1243,14 +1243,19 @@ proc CoSim {} {
   return ""
 }
 
+#--------------------------------------------------------------
+proc RemoveFilePathChars {PathString} {
+  return [regsub {:} [regsub -all {\/} ${PathString} "_"] ""]
+}
+
 # -------------------------------------------------
 proc generic {Name Value} {
   variable GenericDict
   variable GenericNames
   variable GenericOptions
 
   dict append GenericDict $Name $Value
-  set GenericNames ${GenericNames}_${Name}_${Value}
+  set GenericNames ${GenericNames}_${Name}_[RemoveFilePathChars ${Value}]
 #x  lappend GenericOptions [vendor_generic ${Name} ${Value}] 
   append GenericOptions " " [vendor_generic ${Name} ${Value}]
   return ""
@@ -1279,7 +1284,7 @@ proc ToGenericNames {GenericDict} {
   set Names ""
   if {${GenericDict} ne ""} {
     foreach {GenericName GenericValue} $GenericDict {
-      set Names ${Names}_${GenericName}_${GenericValue}
+      set Names ${Names}_${GenericName}_[RemoveFilePathChars ${GenericValue}]
     }
   }
   return $Names