[Cmake-commits] CMake branch, next, updated. v2.8.8-2799-gf3fd279

[Bill Hoffman]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  f3fd279448a9c0ec48a7d77287fb8f1de54a594f (commit)
       via  a7abf5e090379a77f50ce2285ac4c1c99159d9d2 (commit)
      from  7b1f8a20333da3d3c982a6b3905e691f3867857a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f3fd279448a9c0ec48a7d77287fb8f1de54a594f
commit f3fd279448a9c0ec48a7d77287fb8f1de54a594f
Merge: 7b1f8a2 a7abf5e
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Wed May 2 16:47:58 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 2 16:47:58 2012 -0400

    Merge topic 'mumps_coverage' into next
    
    a7abf5e Add ability to specify more than one package directory or coverage directory.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7abf5e090379a77f50ce2285ac4c1c99159d9d2
commit a7abf5e090379a77f50ce2285ac4c1c99159d9d2
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Wed May 2 16:47:24 2012 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Wed May 2 16:47:24 2012 -0400

    Add ability to specify more than one package directory or coverage directory.

diff --git a/Source/CTest/cmParseMumpsCoverage.cxx b/Source/CTest/cmParseMumpsCoverage.cxx
index ed263a4..7076315 100644
--- a/Source/CTest/cmParseMumpsCoverage.cxx
+++ b/Source/CTest/cmParseMumpsCoverage.cxx
@@ -29,24 +29,32 @@ bool cmParseMumpsCoverage::ReadCoverageFile(const char* file)
     return false;
     }
   std::string line;
-  cmSystemTools::GetLineFromStream(in, line);
-  std::string::size_type pos = line.find(':', 0);
-  std::string packages;
-  if(pos != std::string::npos)
+  while(cmSystemTools::GetLineFromStream(in, line))
     {
-    packages = line.substr(pos+1);
-    }
-  cmSystemTools::GetLineFromStream(in, line);
-  pos = line.find(':', 0);
-  std::string coverage_dir;
-  if(pos != std::string::npos)
-    {
-    coverage_dir = line.substr(pos+1);
+    std::string::size_type pos = line.find(':', 0);
+    std::string packages;
+    if(pos != std::string::npos)
+      {
+      std::string type = line.substr(0, pos);
+      std::string path = line.substr(pos+1);
+      if(type == "packages")
+        {
+        this->LoadPackages(path.c_str());
+        }
+      else if(type == "coverage_dir")
+        {
+        this->LoadCoverageData(path.c_str());
+        }
+      else
+        {
+        cmCTestLog(this->CTest, ERROR_MESSAGE,
+                   "Parse Error in Mumps coverage file :\n"
+                   << file <<
+                   "\ntype: [" << type << "]\npath:[" << path << "]\n"
+                   "input line: [" << line << "]\n");
+        }
+      }
     }
-  // load the mumps files from the packages directory
-  this->LoadPackages(packages.c_str());
-  // now load the *.mcov files from the coverage directory
-  this->LoadCoverageData(coverage_dir.c_str());
   return true;
 }
 

-----------------------------------------------------------------------

Summary of changes:
 Source/CTest/cmParseMumpsCoverage.cxx |   40 +++++++++++++++++++-------------
 1 files changed, 24 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
CMake