[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4185-gd5bd3ec

[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  d5bd3ece49f22c30a3952f0f96cdce4b9f426b25 (commit)
       via  54a3e2a9e5fb1c8eaf05060014fb97d082436f68 (commit)
      from  9b280f7374cbf10dafc36de04732b53e3e4e27cd (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=d5bd3ece49f22c30a3952f0f96cdce4b9f426b25
commit d5bd3ece49f22c30a3952f0f96cdce4b9f426b25
Merge: 9b280f7 54a3e2a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 13 14:52:51 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 13 14:52:51 2013 -0400

    Merge topic 'cleanup-CTestTestMemcheck' into next
    
    54a3e2a CTestTestMemcheck: Fix matching of Guard Malloc messages


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54a3e2a9e5fb1c8eaf05060014fb97d082436f68
commit 54a3e2a9e5fb1c8eaf05060014fb97d082436f68
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 13 14:46:15 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 13 14:46:15 2013 -0400

    CTestTestMemcheck: Fix matching of Guard Malloc messages
    
    In commit 10bc50ea (Tests: ignore Guard Malloc messages in MemChecker
    tests, 2013-05-13) we forgot to escape backslashes in the CMake language
    to get them into the regex.  Add them now.

diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt
index d595c98..b5162c9 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -37,7 +37,7 @@ add_subdirectory(NoLogDummyChecker)
 
 if(APPLE)
   # filter out additional messages by Guard Malloc integrated in Xcode
-  set(guard_malloc_msg "ctest\([0-9]+\) malloc: ")
+  set(guard_malloc_msg "ctest\\([0-9]+\\) malloc: ")
   set(guard_malloc_lines "(${guard_malloc_msg}[^\n]*\n)*")
   set(guard_malloc_output "${guard_malloc_msg}|")
 else()

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

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


hooks/post-receive
-- 
CMake