[Cmake-commits] CMake branch, next, updated. v2.8.8-2808-gdaef914
David Cole
david.cole at kitware.com
Thu May 3 17:19:29 EDT 2012
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 daef91488489b838246337f62bd1cd4b6285b623 (commit)
via 56f499dcef320b2644431223bd167de521fdf068 (commit)
via 9a6d7881fdcfc69feb54b2d287674bc5fcc1fd86 (commit)
from a7f8809d06d8004a708174adffa44a3af82afa23 (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=daef91488489b838246337f62bd1cd4b6285b623
commit daef91488489b838246337f62bd1cd4b6285b623
Merge: a7f8809 56f499d
Author: David Cole <david.cole at kitware.com>
AuthorDate: Thu May 3 17:19:27 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 3 17:19:27 2012 -0400
Merge topic 'fix-13121-handle-gcov47-output' into next
56f499d CTest: Modify reg ex so it also works with gcov 4.7 output (#13121)
9a6d788 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=56f499dcef320b2644431223bd167de521fdf068
commit 56f499dcef320b2644431223bd167de521fdf068
Author: David Cole <david.cole at kitware.com>
AuthorDate: Thu May 3 16:02:27 2012 -0400
Commit: David Cole <david.cole at kitware.com>
CommitDate: Thu May 3 17:08:19 2012 -0400
CTest: Modify reg ex so it also works with gcov 4.7 output (#13121)
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx
index ae06b0f..15c02b4 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -800,7 +800,7 @@ int cmCTestCoverageHandler::HandleGCovCoverage(
std::string st2gcovOutputRex1 = "^File *[`'](.*)'$";
std::string st2gcovOutputRex2
= "Lines executed: *[0-9]+\\.[0-9]+% of [0-9]+$";
- std::string st2gcovOutputRex3 = "^(.*):creating [`'](.*\\.gcov)'";
+ std::string st2gcovOutputRex3 = "^(.*)reating [`'](.*\\.gcov)'";
std::string st2gcovOutputRex4 = "^(.*):unexpected EOF *$";
std::string st2gcovOutputRex5 = "^(.*):cannot open source file*$";
std::string st2gcovOutputRex6
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Source/CTest/cmCTestCoverageHandler.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list