[Cmake-commits] CMake branch, next, updated. v3.1.0-1988-g4dc9ac8

[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  4dc9ac8e94e6bfae374b98c6afa3efbb6ca76d58 (commit)
       via  acdab825420512a8bfb5f337faa4a7fe7ded3279 (commit)
      from  27e9e847d18de8df5ddafa72d6db80e9b657fb45 (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=4dc9ac8e94e6bfae374b98c6afa3efbb6ca76d58
commit 4dc9ac8e94e6bfae374b98c6afa3efbb6ca76d58
Merge: 27e9e84 acdab82
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Thu Jan 15 18:07:58 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 15 18:07:58 2015 -0500

    Merge topic 'cdash_upload_file_mode' into next
    
    acdab825 Use the full path to the gcda file, and use bzip2 compress for tar files.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=acdab825420512a8bfb5f337faa4a7fe7ded3279
commit acdab825420512a8bfb5f337faa4a7fe7ded3279
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Thu Jan 15 18:05:29 2015 -0500
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Thu Jan 15 18:05:29 2015 -0500

    Use the full path to the gcda file, and use bzip2 compress for tar files.
    
    bzip2 does not put any date stamp in, and CDash can uncompress it, so compress
    the tar file.

diff --git a/Modules/CTestCoverageCollectGCOV.cmake b/Modules/CTestCoverageCollectGCOV.cmake
index 551fbd0..29fd504 100644
--- a/Modules/CTestCoverageCollectGCOV.cmake
+++ b/Modules/CTestCoverageCollectGCOV.cmake
@@ -94,6 +94,7 @@ function(ctest_coverage_collect_gcov)
   # call gcov on each .gcda file
   foreach (gcda_file ${gcda_files})
     # get the directory of the gcda file
+    get_filename_component(gcda_file ${binary_dir}/${gcda_file} ABSOLUTE)
     get_filename_component(gcov_dir ${gcda_file} DIRECTORY)
     # run gcov, this will produce the .gcov file in the current
     # working directory
@@ -115,7 +116,7 @@ function(ctest_coverage_collect_gcov)
   # sum will be the same for the tar file independent of file time
   # stamps
   execute_process(COMMAND
-    ${CMAKE_COMMAND} -E tar cvf ${GCOV_TARBALL}
+    ${CMAKE_COMMAND} -E tar cvfj ${GCOV_TARBALL}
     --mtime=1970-01-01\ 0:0:0\ UTC ${gcov_files}
     ${coverage_dir}/data.json  ${label_files}
     WORKING_DIRECTORY ${binary_dir})

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

Summary of changes:
 Modules/CTestCoverageCollectGCOV.cmake |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake