[Cmake-commits] CMake branch, next, updated. v2.8.6-1611-ge18f866

[David Cole]

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  e18f86692b9a70fc8b405ae4eb8cb46302bac960 (commit)
       via  2f309cba455d0a946e935f66a53561ba64717faf (commit)
       via  af772893b856b50697f18c9bb7b1a0fb326cf715 (commit)
       via  b9e9ad57fa9914d5b3c34a39a5d00d77051a1614 (commit)
      from  9217831a37d63bfb9d40af5ba23c121198c0d747 (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=e18f86692b9a70fc8b405ae4eb8cb46302bac960
commit e18f86692b9a70fc8b405ae4eb8cb46302bac960
Merge: 9217831 2f309cb
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Sat Oct 22 11:07:58 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 22 11:07:58 2011 -0400

    Merge topic 'fix-12490-shorten-gcov-filenames' into next
    
    2f309cb CTest: Add COVERAGE_EXTRA_FLAGS cache variable (#12490)
    af77289 KWSys Nightly Date Stamp
    b9e9ad5 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f309cba455d0a946e935f66a53561ba64717faf
commit 2f309cba455d0a946e935f66a53561ba64717faf
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Sat Oct 22 10:38:16 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Sat Oct 22 11:01:58 2011 -0400

    CTest: Add COVERAGE_EXTRA_FLAGS cache variable (#12490)
    
    COVERAGE_EXTRA_FLAGS is a space separated value of extra flags
    that will be passed to gcov when ctest's coverage handler invokes
    gcov to do coverage analysis.
    
    Map to CoverageExtraFlags in the CTest ini file. Use default value
    of "-l" to match the coverage handler's earlier behavior from ctest
    2.8.4 and earlier. The fix for related issue #11717 had added a " -p"
    which was the cause of both #12415 and #12490. Here, we revert that
    change to the default value, so -p is no longer there by default.
    The people that care to add -p may do so in their own build trees
    by appending " -p" to the new cache variable COVERAGE_EXTRA_FLAGS.

diff --git a/Modules/CTest.cmake b/Modules/CTest.cmake
index c261eb3..ec9dbeb 100644
--- a/Modules/CTest.cmake
+++ b/Modules/CTest.cmake
@@ -189,6 +189,8 @@ IF(BUILD_TESTING)
   FIND_PROGRAM(COVERAGE_COMMAND gcov DOC 
     "Path to the coverage program that CTest uses for performing coverage inspection"
     )
+  SET(COVERAGE_EXTRA_FLAGS "-l" CACHE STRING
+    "Extra command line flags to pass to the coverage tool")
 
   # set the site name
   SITE_NAME(SITE)
@@ -257,6 +259,7 @@ IF(BUILD_TESTING)
     BZRCOMMAND
     BZR_UPDATE_OPTIONS
     COVERAGE_COMMAND
+    COVERAGE_EXTRA_FLAGS
     CTEST_SUBMIT_RETRY_DELAY
     CTEST_SUBMIT_RETRY_COUNT
     CVSCOMMAND
diff --git a/Modules/DartConfiguration.tcl.in b/Modules/DartConfiguration.tcl.in
index caf0afe..ad7f805 100644
--- a/Modules/DartConfiguration.tcl.in
+++ b/Modules/DartConfiguration.tcl.in
@@ -59,14 +59,17 @@ UpdateType: @UPDATE_TYPE@
 # Compiler info
 Compiler: @CMAKE_CXX_COMPILER@
 
-# Dynamic analysis and coverage
+# Dynamic analysis (MemCheck)
 PurifyCommand: @PURIFYCOMMAND@
 ValgrindCommand: @VALGRIND_COMMAND@
 ValgrindCommandOptions: @VALGRIND_COMMAND_OPTIONS@
 MemoryCheckCommand: @MEMORYCHECK_COMMAND@
 MemoryCheckCommandOptions: @MEMORYCHECK_COMMAND_OPTIONS@
 MemoryCheckSuppressionFile: @MEMORYCHECK_SUPPRESSIONS_FILE@
+
+# Coverage
 CoverageCommand: @COVERAGE_COMMAND@
+CoverageExtraFlags: @COVERAGE_EXTRA_FLAGS@
 
 # Cluster commands
 SlurmBatchCommand: @SLURM_SBATCH_COMMAND@
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index 005651f..0b1c9fe 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -751,12 +751,15 @@ int cmCTestCoverageHandler::HandlePHPCoverage(
     }
   return static_cast<int>(cont->TotalCoverage.size());
 }
+
 //----------------------------------------------------------------------
 int cmCTestCoverageHandler::HandleGCovCoverage(
   cmCTestCoverageHandlerContainer* cont)
 {
   std::string gcovCommand
     = this->CTest->GetCTestConfiguration("CoverageCommand");
+  std::string gcovExtraFlags
+    = this->CTest->GetCTestConfiguration("CoverageExtraFlags");
 
   // Style 1
   std::string st1gcovOutputRex1
@@ -825,8 +828,10 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
     // Call gcov to get coverage data for this *.gcda file:
     //
     std::string fileDir = cmSystemTools::GetFilenamePath(it->c_str());
-    std::string command = "\"" + gcovCommand + "\" -l -p -o \"" + fileDir
-      + "\" \"" + *it + "\"";
+    std::string command = "\"" + gcovCommand + "\" " +
+      gcovExtraFlags + " " +
+      "-o \"" + fileDir + "\" " +
+      "\"" + *it + "\"";
 
     cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, command.c_str()
       << std::endl);

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

Summary of changes:
 Modules/CTest.cmake                     |    3 +++
 Modules/DartConfiguration.tcl.in        |    5 ++++-
 Source/CTest/cmCTestCoverageHandler.cxx |    9 +++++++--
 Source/kwsys/kwsysDateStamp.cmake       |    2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake