[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3919-g59c0f98

[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  59c0f980829a3f5a5ed87edc2264657670a3f6dd (commit)
       via  192b27e47aa15fe0691bb112e276230bffefaa19 (commit)
      from  06b0ea04c420a031e10d7c5c2e10e69659a396e5 (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=59c0f980829a3f5a5ed87edc2264657670a3f6dd
commit 59c0f980829a3f5a5ed87edc2264657670a3f6dd
Merge: 06b0ea0 192b27e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 16 16:17:19 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 16 16:17:19 2013 -0400

    Merge topic 'cleanup-CTestTestMemcheck' into next
    
    192b27e CTestTestMemcheck: Fix newline matching in expected output


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=192b27e47aa15fe0691bb112e276230bffefaa19
commit 192b27e47aa15fe0691bb112e276230bffefaa19
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 16 16:06:44 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 16 16:06:49 2013 -0400

    CTestTestMemcheck: Fix newline matching in expected output
    
    Replace CRLF with LF when read from source CMakeLists.txt file.

diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt
index e721506..d595c98 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -52,7 +52,7 @@ endif()
 #  - Valgrind memcheck may add extra "==..." lines.
 set(other_tool_output "((${guard_malloc_output}BullseyeCoverage|==)[^\n]*\n)*")
 
-set(ctest_and_tool_outputs "
+string(REPLACE "\r\n" "\n" ctest_and_tool_outputs "
 1/1 MemCheck #1: RunCMake \\.+   Passed +[0-9]+\\.[0-9]+ sec
 ${guard_malloc_lines}
 100% tests passed, 0 tests failed out of 1

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

Summary of changes:
 Tests/CTestTestMemcheck/CMakeLists.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake