[Cmake-commits] CMake branch, next, updated. v3.0.0-4431-gc358acd

[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  c358acdf20f5bf8367b7eceec6264c5c0463551d (commit)
       via  80ee17d8a49489816ea4e10f5fe10d300bd8a292 (commit)
      from  ef8ae0c56fc87ddd1b2848f9c54f44f518aca6b9 (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=c358acdf20f5bf8367b7eceec6264c5c0463551d
commit c358acdf20f5bf8367b7eceec6264c5c0463551d
Merge: ef8ae0c 80ee17d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 22 11:12:57 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 22 11:12:57 2014 -0400

    Merge topic 'fix_guard_malloc_forbc' into next
    
    80ee17d8 Tests/CTestTestMemcheck: Tolerate malloc guard in BC output


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80ee17d8a49489816ea4e10f5fe10d300bd8a292
commit 80ee17d8a49489816ea4e10f5fe10d300bd8a292
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Thu Jul 17 11:32:48 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 22 11:13:29 2014 -0400

    Tests/CTestTestMemcheck: Tolerate malloc guard in BC output

diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt
index d16d432..f436706 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -225,7 +225,7 @@ set_tests_properties(CTestTestMemcheckDummyValgrindIgnoreMemcheck
     PASS_REGULAR_EXPRESSION "\n2/2 Test #2: RunCMakeAgain .*${ctest_and_tool_outputs}$")
 
 set_tests_properties(CTestTestMemcheckDummyBC PROPERTIES
-    PASS_REGULAR_EXPRESSION "\n1/1 MemCheck #1: RunCMake \\.+   Passed +[0-9]+.[0-9]+ sec\n\n100% tests passed, 0 tests failed out of 1\n(.*\n)?Error parsing XML in stream at line 1: no element found\n")
+    PASS_REGULAR_EXPRESSION "\n1/1 MemCheck #1: RunCMake \\.+   Passed +[0-9]+.[0-9]+ sec\n${guard_malloc_lines}\n100% tests passed, 0 tests failed out of 1\n(.*\n)?Error parsing XML in stream at line 1: no element found\n")
 
 set_tests_properties(CTestTestMemcheckDummyValgrindInvalidSupFile PROPERTIES
     PASS_REGULAR_EXPRESSION "\nCannot find memory checker suppression file: ${CTEST_ESCAPED_REALPATH_CMAKE_CURRENT_BINARY_DIR}/does-not-exist\n")

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

Summary of changes:


hooks/post-receive
-- 
CMake