瀏覽代碼

CTest: Make coverage file selection more specific.

When performing some other testing, the globs for Blanket.js and Delphi
code coverage are picking up unintended files.  Change the query for the
Delphi coverage to follow the naming convention, and check the second line
of the found JSON files for certain text before parsing them as coverage files.
Joseph Snyder 10 年之前
父節點
當前提交
bc29ed542b
共有 1 個文件被更改,包括 18 次插入2 次删除
  1. 18 2
      Source/CTest/cmCTestCoverageHandler.cxx

+ 18 - 2
Source/CTest/cmCTestCoverageHandler.cxx

@@ -983,7 +983,7 @@ int cmCTestCoverageHandler::HandleDelphiCoverage(
 
   std::string BinDir
     = this->CTest->GetBinaryDir();
-  std::string coverageFile = BinDir+ "/*.html";
+  std::string coverageFile = BinDir+ "/*(*.pas).html";
 
 
   g.FindFiles(coverageFile);
@@ -1017,9 +1017,25 @@ int cmCTestCoverageHandler::HandleBlanketJSCoverage(
   std::string coverageFile = SourceDir+ "/*.json";
   cmsys::Glob g;
   std::vector<std::string> files;
+  std::vector<std::string> blanketFiles;
   g.FindFiles(coverageFile);
   files=g.GetFiles();
-  if (!files.empty())
+  // Ensure that the JSON files found are the result of the
+  // Blanket.js output. Check for the "node-jscoverage"
+  // string on the second line
+  std::string line;
+  for(unsigned int fileEntry=0;fileEntry<files.size();fileEntry++)
+    {
+    cmsys::ifstream in(files[fileEntry].c_str());
+    cmSystemTools::GetLineFromStream(in, line);
+    cmSystemTools::GetLineFromStream(in, line);
+    if (line.find("node-jscoverage") != line.npos)
+      {
+      blanketFiles.push_back(files[fileEntry]);
+      }
+    }
+  //  Take all files with the node-jscoverage string and parse those
+  if (!blanketFiles.empty())
     {
     cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
       "Found BlanketJS output JSON, Performing Coverage" << std::endl,