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 76ef512f4c3bdce8f6e177d9cf1c958f36966f9b (commit)
via 9c4984b4e50b3ab9c09349240c532957c3189116 (commit)
from 5c643daa6edc597d8a3ffe0fc569fdc6100fd204 (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=76ef512f4c3bdce8f6e177d9cf1c958f36966f9b
commit 76ef512f4c3bdce8f6e177d9cf1c958f36966f9b
Merge: 5c643da 9c4984b
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Dec 22 09:27:02 2014 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Dec 22 09:27:02 2014 -0500
Merge topic 'ctest-coverage-extra-line-error' into next
9c4984b4 ctest_coverage: Fix error message to report the file name
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c4984b4e50b3ab9c09349240c532957c3189116
commit 9c4984b4e50b3ab9c09349240c532957c3189116
Author: Vladislav Vinogradov <vlad.vinogrado...@gmail.com>
AuthorDate: Mon Dec 22 10:24:31 2014 +0300
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Dec 22 09:25:24 2014 -0500
ctest_coverage: Fix error message to report the file name
Print file name instead of line content for "Looks like there are more
lines in the file:" error message.
diff --git a/Source/CTest/cmCTestCoverageHandler.cxx
b/Source/CTest/cmCTestCoverageHandler.cxx
index e782886..a1d770b 100644
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@@ -585,7 +585,7 @@ int cmCTestCoverageHandler::ProcessHandler()
if ( cmSystemTools::GetLineFromStream(ifs, line) )
{
cmOStringStream ostr;
- ostr << "Looks like there are more lines in the file: " << line;
+ ostr << "Looks like there are more lines in the file: " << fullFileName;
errorsWhileAccumulating.push_back(ostr.str());
}
float cper = 0;
-----------------------------------------------------------------------
Summary of changes:
Source/CTest/cmCTestCoverageHandler.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
