[Cmake-commits] CMake branch, next, updated. v2.8.8-2725-g230f840

[Brad King]

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  230f840119d3854ecfbf6f44813b65eb6d5e92b9 (commit)
       via  3da577dec00a4ab9572e37be4ed8be4996ae79b3 (commit)
      from  cffb9da3723bd81e37bb5bf18f21aa7b44951417 (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=230f840119d3854ecfbf6f44813b65eb6d5e92b9
commit 230f840119d3854ecfbf6f44813b65eb6d5e92b9
Merge: cffb9da 3da577d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 26 15:50:57 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 26 15:50:57 2012 -0400

    Merge topic 'ctest_memcheck-xml-encoding' into next
    
    3da577d CTest: Escape MemCheck test output for XML (#13124)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3da577dec00a4ab9572e37be4ed8be4996ae79b3
commit 3da577dec00a4ab9572e37be4ed8be4996ae79b3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 12 11:52:32 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 26 15:49:29 2012 -0400

    CTest: Escape MemCheck test output for XML (#13124)
    
    Any output that goes through CleanTestOutput must be printed through
    cmXMLSafe.

diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index 035aaa9..3e4ecdd 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -358,7 +358,7 @@ void cmCTestMemCheckHandler::GenerateDartOutput(std::ostream& os)
 
     os
       << "\t\t</Results>\n"
-      << logTag << memcheckstr << std::endl
+      << logTag << cmXMLSafe(memcheckstr) << std::endl
       << "\t</Log>\n";
     this->WriteTestResultFooter(os, result);
     if ( current < cc )

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

Summary of changes:
 Source/CTest/cmCTestMemCheckHandler.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake