[cmake-commits] david.cole committed cmCTest.cxx 1.320 1.321

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv24628/Source

Modified Files:
	cmCTest.cxx 
Log Message:
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.


Index: cmCTest.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCTest.cxx,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -d -r1.320 -r1.321
--- cmCTest.cxx	8 Jun 2007 18:16:04 -0000	1.320
+++ cmCTest.cxx	11 Jun 2007 19:36:50 -0000	1.321
@@ -2204,17 +2204,25 @@
     {
     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;
 }