[Cmake-commits] CMake branch, next, updated. v3.5.1-821-g70ae13e

[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  70ae13e6720ca49711c2afa36fcc7e036bd91432 (commit)
       via  1c92713c64e8d85804a7f6fe3dcf936e36b08101 (commit)
       via  d32313426b4744823b0afd240223dce0aaef6bd8 (commit)
      from  42c8dec332620edce95b558c57173ad1c04fb340 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=70ae13e6720ca49711c2afa36fcc7e036bd91432
commit 70ae13e6720ca49711c2afa36fcc7e036bd91432
Merge: 42c8dec 1c92713
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Apr 5 12:15:17 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 5 12:15:17 2016 -0400

    Merge topic 'branch_coverage_glob' into next
    
    1c92713c CTestCoverageCollectGCOV: fix in-source test
    d3231342 CTestCoverageCollectGCOV: exclude uncovered files


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c92713c64e8d85804a7f6fe3dcf936e36b08101
commit 1c92713c64e8d85804a7f6fe3dcf936e36b08101
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Apr 5 11:58:09 2016 -0400
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Tue Apr 5 12:14:03 2016 -0400

    CTestCoverageCollectGCOV: fix in-source test
    
    Fix the test of this module for in-source builds by excluding
    the CMakeFiles directory from our results.

diff --git a/Tests/CTestCoverageCollectGCOV/test.cmake.in b/Tests/CTestCoverageCollectGCOV/test.cmake.in
index ec32113..d48ef61 100644
--- a/Tests/CTestCoverageCollectGCOV/test.cmake.in
+++ b/Tests/CTestCoverageCollectGCOV/test.cmake.in
@@ -15,6 +15,7 @@ list(APPEND CTEST_CUSTOM_COVERAGE_EXCLUDE
   "/foo/something"
   "/3rdparty/"
   "/bar/somethingelse"
+  "/CMakeFiles/"
 )
 list(APPEND CTEST_EXTRA_COVERAGE_GLOB "*.cpp")
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d32313426b4744823b0afd240223dce0aaef6bd8
commit d32313426b4744823b0afd240223dce0aaef6bd8
Author:     Zack Galbreath <zack.galbreath at kitware.com>
AuthorDate: Tue Apr 5 12:09:18 2016 -0400
Commit:     Zack Galbreath <zack.galbreath at kitware.com>
CommitDate: Tue Apr 5 12:12:24 2016 -0400

    CTestCoverageCollectGCOV: exclude uncovered files
    
    Any uncovered files found by CTEST_EXTRA_COVERAGE_GLOB are now
    subject to the exclusion filters set in CTEST_CUSTOM_COVERAGE_EXCLUDE.

diff --git a/Modules/CTestCoverageCollectGCOV.cmake b/Modules/CTestCoverageCollectGCOV.cmake
index 7d387a5..ed21384 100644
--- a/Modules/CTestCoverageCollectGCOV.cmake
+++ b/Modules/CTestCoverageCollectGCOV.cmake
@@ -227,6 +227,21 @@ function(ctest_coverage_collect_gcov)
   endforeach()
 
   foreach (uncovered_file ${uncovered_files})
+    # Check if this uncovered file should be excluded.
+    set(is_excluded false)
+    foreach(exclude_entry IN LISTS CTEST_CUSTOM_COVERAGE_EXCLUDE)
+      if(uncovered_file MATCHES "${exclude_entry}")
+        set(is_excluded true)
+        if(NOT GCOV_QUIET)
+          message("Excluding coverage for: ${uncovered_file} which matches ${exclude_entry}")
+        endif()
+        break()
+      endif()
+    endforeach()
+    if(is_excluded)
+      continue()
+    endif()
+
     # Copy from source to binary dir, preserving any intermediate subdirectories.
     get_filename_component(filename "${uncovered_file}" NAME)
     get_filename_component(relative_path "${uncovered_file}" DIRECTORY)

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

Summary of changes:
 Modules/CTestCoverageCollectGCOV.cmake       |   15 +++++++++++++++
 Tests/CTestCoverageCollectGCOV/test.cmake.in |    1 +
 2 files changed, 16 insertions(+)


hooks/post-receive
-- 
CMake