[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-1022-gfa20f87

[Zack Galbreath]

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  fa20f87d1dc948d4cb1373148460f03973608b9c (commit)
       via  048953b11be03bccd7d0a16566c092cc506c4233 (commit)
      from  d44e70761f94d2cf0b52fb028ff2bf520525bb3c (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=fa20f87d1dc948d4cb1373148460f03973608b9c
commit fa20f87d1dc948d4cb1373148460f03973608b9c
Merge: d44e707 048953b
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Mon Jul 13 12:18:00 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 13 12:18:00 2015 -0400

    Merge topic 'coverage_no_tests' into next
    
    048953b1 always do coverage for CTEST_EXTRA_COVERAGE_GLOB


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=048953b11be03bccd7d0a16566c092cc506c4233
commit 048953b11be03bccd7d0a16566c092cc506c4233
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Mon Jul 13 11:56:06 2015 -0400
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Mon Jul 13 11:56:06 2015 -0400

    always do coverage for CTEST_EXTRA_COVERAGE_GLOB
    
    Do not ignore a coverage request if CTEST_EXTRA_COVERAGE_GLOB
    was specified.  Prior to this commit, if no lines of code
    were covered by any tests then CTest would neglect to
    generate a Coverage.xml file.  This change allows us to
    report uncovered files for a project with no tests.

diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index f92f19a..8b39621 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -446,7 +446,7 @@ int cmCTestCoverageHandler::ProcessHandler()
     }
   std::set<std::string> uncovered = this->FindUncoveredFiles(&cont);
 
-  if ( file_count == 0 )
+  if ( file_count == 0 && this->ExtraCoverageGlobs.size() == 0)
     {
     cmCTestOptionalLog(this->CTest, WARNING,
       " Cannot find any coverage files. Ignoring Coverage request."

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

Summary of changes:
 Source/CTest/cmCTestCoverageHandler.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake