[Cmake-commits] CMake branch, next, updated. v2.8.1-1385-g5db1496

[Zach Mullen]

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  5db1496efaef0243836e253e7bc7951134d904b0 (commit)
       via  9d6567a26998024e7614c7cff322319f47526c80 (commit)
      from  1ef2dc01af9212c955ae3b15d642073598091573 (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=5db1496efaef0243836e253e7bc7951134d904b0
commit 5db1496efaef0243836e253e7bc7951134d904b0
Merge: 1ef2dc0 9d6567a
Author: Zach Mullen <zach.mullen at kitware.com>
Date:   Fri Jun 11 14:17:20 2010 -0400

    Merge branch 'coverage_exclusion_from_glob' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d6567a26998024e7614c7cff322319f47526c80
commit 9d6567a26998024e7614c7cff322319f47526c80
Author: Zach Mullen <zach.mullen at kitware.com>
Date:   Fri Jun 11 14:17:00 2010 -0400

    Extra coverage glob should subtract the explicitly defined excluded files

diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index 3235bfd..55a5225 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -2038,8 +2038,12 @@ std::set<std::string> cmCTestCoverageHandler::FindUncoveredFiles(
     for(std::vector<std::string>::iterator f = files.begin();
         f != files.end(); ++f)
       {
-      extraMatches.insert(this->CTest->GetShortPathToFile(
-        f->c_str()));
+      if(this->ShouldIDoCoverage(f->c_str(),
+         cont->SourceDir.c_str(), cont->BinaryDir.c_str()))
+        {
+        extraMatches.insert(this->CTest->GetShortPathToFile(
+          f->c_str()));
+        }
       }
     }
 

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

Summary of changes:
 Source/CTest/cmCTestCoverageHandler.cxx |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake