[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4187-g0196636

[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  01966369a11feec46ed3868a88199c76218e41d0 (commit)
       via  e8e67aed224d27c61c690940655ab8495083fca1 (commit)
      from  d5bd3ece49f22c30a3952f0f96cdce4b9f426b25 (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=01966369a11feec46ed3868a88199c76218e41d0
commit 01966369a11feec46ed3868a88199c76218e41d0
Merge: d5bd3ec e8e67ae
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 13 16:50:53 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 13 16:50:53 2013 -0400

    Merge topic 'cleanup-CTestTestMemcheck' into next
    
    e8e67ae CTestTestMemcheck: Fix matching of malloc debug messages


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e8e67aed224d27c61c690940655ab8495083fca1
commit e8e67aed224d27c61c690940655ab8495083fca1
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 16:47:47 2013 -0400

    CTestTestMemcheck: Fix matching of malloc debug 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:


hooks/post-receive
-- 
CMake