From bc29ed542bbe8ff6b0bc178a7940a166680e002e Mon Sep 17 00:00:00 2001
From: Joseph Snyder <joe.snyder@kitware.com>
Date: Wed, 18 Nov 2015 13:01:22 -0500
Subject: 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.
---
 Source/CTest/cmCTestCoverageHandler.cxx | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index 2c2cd48..fd62696 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/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,
-- 
cgit v0.12