[Cmake-commits] CMake branch, next, updated. v3.0.0-4382-g97d24d3

[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  97d24d35216972ee496fa38d855bcdc72a694aaa (commit)
       via  ffd404616de587479048455648d566a80ca427f1 (commit)
      from  76ed15be38bc929169d035df9f9da4cdeb9a7a4c (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=97d24d35216972ee496fa38d855bcdc72a694aaa
commit 97d24d35216972ee496fa38d855bcdc72a694aaa
Merge: 76ed15b ffd4046
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 21 10:48:36 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 21 10:48:36 2014 -0400

    Merge topic 'fix_guard_malloc_forbc' into next
    
    ffd40461 Tests/CTestTestMemcheck: Fix malloc guard location


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ffd404616de587479048455648d566a80ca427f1
commit ffd404616de587479048455648d566a80ca427f1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 21 10:48:27 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 21 10:48:27 2014 -0400

    Tests/CTestTestMemcheck: Fix malloc guard location

diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt
index 710994c..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)?${guard_malloc_lines}(\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:
 Tests/CTestTestMemcheck/CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake