BUG: Never return a string containing a ":" from cmCTest::GetShortPathToFile - replace them with "_". DART cannot construct valid file names during dashboard rollup with ":" in the short path. Also, fix the Bullseye coverage handler so that the file names and paths match in both the coverage summary and the individual coverage logs.

1 files changed, 14 insertions, 6 deletions

diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index b650001..3e5d9c6 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -2204,17 +2204,25 @@ std::string cmCTest::GetShortPathToFile(const char* cfname)
     {
     res = &bldRelpath;
     }
+
+  std::string path;
+
   if ( !res )
     {
-    return fname;
+    path = fname;
     }
-  cmSystemTools::ConvertToUnixSlashes(*res);
-
-  std::string path = "./" + *res;
-  if ( path[path.size()-1] == '/' )
+  else
     {
-    path = path.substr(0, path.size()-1);
+    cmSystemTools::ConvertToUnixSlashes(*res);
+
+    path = "./" + *res;
+    if ( path[path.size()-1] == '/' )
+      {
+      path = path.substr(0, path.size()-1);
+      }
     }
+
+  cmsys::SystemTools::ReplaceString(path, ":", "_");
   return path;
 }