[Cmake-commits] [cmake-commits] king committed cmCTestCoverageHandler.cxx 1.65 1.66

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTestCoverageHandler.cxx 
Log Message:
BUG: Fix coverage label reports for Bullseye

This teaches CTest to report Labels elements in the Coverage.xml file
for Bullseye coverage results.


Index: cmCTestCoverageHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestCoverageHandler.cxx,v
retrieving revision 1.65
retrieving revision 1.66
diff -C 2 -d -r1.65 -r1.66
*** cmCTestCoverageHandler.cxx	2 Mar 2009 20:32:59 -0000	1.65
--- cmCTestCoverageHandler.cxx	2 Mar 2009 20:33:03 -0000	1.66
***************
*** 1541,1544 ****
--- 1541,1546 ----
  
        std::string fileName = cmSystemTools::GetFilenameName(file.c_str());
+       std::string shortFileName =
+         this->CTest->GetShortPathToFile(file.c_str());
  
        float cper = percentBranch + percentFunction;
***************
*** 1565,1570 ****
        tmpLog << "coverage metric: " << cmet << "\n";
        covSumFile << "\t<File Name=\"" << cmXMLSafe(sourceFile)
!                  << "\" FullPath=\"" << cmXMLSafe(
!                    this->CTest->GetShortPathToFile(file.c_str()))
                   << "\" Covered=\"" << (cmet>0?"true":"false") << "\">\n"
                   << "\t\t<BranchesTested>"
--- 1567,1571 ----
        tmpLog << "coverage metric: " << cmet << "\n";
        covSumFile << "\t<File Name=\"" << cmXMLSafe(sourceFile)
!                  << "\" FullPath=\"" << cmXMLSafe(shortFileName)
                   << "\" Covered=\"" << (cmet>0?"true":"false") << "\">\n"
                   << "\t\t<BranchesTested>"
***************
*** 1594,1599 ****
        covSumFile.setf(std::ios::fixed, std::ios::floatfield);
        covSumFile.precision(2);
!       covSumFile << (cmet) << "</CoverageMetric>\n"
!                  << "\t</File>" << std::endl;
        }
      }
--- 1595,1601 ----
        covSumFile.setf(std::ios::fixed, std::ios::floatfield);
        covSumFile.precision(2);
!       covSumFile << (cmet) << "</CoverageMetric>\n";
!       this->WriteXMLLabels(covSumFile, shortFileName);
!       covSumFile << "\t</File>" << std::endl;
        }
      }