[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2959-g7b54500

[Rolf Eike Beer]

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  7b5450075384eb2ba170adf38632a4db2434fa2f (commit)
       via  68d33b0ca09e632e665063c735fdbe93ad153da9 (commit)
      from  b2d853ba2b589af9dd8859a1a6cbdd7970f5c0e2 (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=7b5450075384eb2ba170adf38632a4db2434fa2f
commit 7b5450075384eb2ba170adf38632a4db2434fa2f
Merge: b2d853b 68d33b0
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon May 13 06:23:59 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 13 06:23:59 2013 -0400

    Merge topic 'MemChecker-improvements' into next
    
    68d33b0 ignore Guard Malloc messages in MemChecker tests


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=68d33b0ca09e632e665063c735fdbe93ad153da9
commit 68d33b0ca09e632e665063c735fdbe93ad153da9
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon May 13 12:23:32 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon May 13 12:23:32 2013 +0200

    ignore Guard Malloc messages in MemChecker tests

diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt
index 1c0c3b2..59d6816 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -33,7 +33,13 @@ target_link_libraries(memcheck_fail CMakeLib)
 # same filenames.
 add_subdirectory(NoLogDummyChecker)
 
-set(NORMAL_CTEST_OUTPUT "\n1/1 MemCheck #1: RunCMake \\.+   Passed +[0-9]+.[0-9]+ sec\n\n100% tests passed, 0 tests failed out of 1\n.*\n-- Processing memory checking output: \nMemory checking results:\n")
+if (XCODE)
+    # filter out additional messages by Guard Malloc integrated in Xcode
+    set(GUARD_MALLOC_MSG "(ctest\([0-9]+\) malloc: [^\n]*\n)*")
+    set(NORMAL_CTEST_OUTPUT "\n1/1 MemCheck #1: RunCMake \\.+   Passed +[0-9]+\\.[0-9]+ sec\n${GUARD_MALLOC_MSG}\n${GUARD_MALLOC_MSG}100% tests passed, 0 tests failed out of 1\n.*\n-- Processing memory checking output: \n${GUARD_MALLOC_MSG}Memory checking results:\n${GUARD_MALLOC_MSG}")
+else ()
+    set(NORMAL_CTEST_OUTPUT "\n1/1 MemCheck #1: RunCMake \\.+   Passed +[0-9]+\\.[0-9]+ sec\n\n100% tests passed, 0 tests failed out of 1\n.*\n-- Processing memory checking output: \nMemory checking results:\n")
+endif ()
 set(BULLSEYE_MSG "(BullseyeCoverage[^\n]*\n)?")
 
 function(gen_mc_test_internal NAME CHECKER)

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

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


hooks/post-receive
-- 
CMake