[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2968-g899125d

[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  899125d4cdb9ba158cc1826027d1b1ec121d20fa (commit)
       via  10bc50eacf2263719161cab19d4e576dcff2589b (commit)
      from  f3263d38c4c7961f60612294b9c0bc7a9d150b06 (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=899125d4cdb9ba158cc1826027d1b1ec121d20fa
commit 899125d4cdb9ba158cc1826027d1b1ec121d20fa
Merge: f3263d3 10bc50e
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue May 14 10:56:31 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 14 10:56:31 2013 -0400

    Merge topic 'MemChecker-improvements' into next
    
    10bc50e Tests: ignore Guard Malloc messages in MemChecker tests


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10bc50eacf2263719161cab19d4e576dcff2589b
commit 10bc50eacf2263719161cab19d4e576dcff2589b
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: Tue May 14 16:56:06 2013 +0200

    Tests: 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:


hooks/post-receive
-- 
CMake