[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3908-gf18c241

[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  f18c2418e3885c65f9412d2af698e976f41cd941 (commit)
       via  88ae0582540a5fdcd04bb3746b0f70b81336fc4e (commit)
      from  ea103fe1b36a3ba3b2d41420e59270c118b1a971 (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=f18c2418e3885c65f9412d2af698e976f41cd941
commit f18c2418e3885c65f9412d2af698e976f41cd941
Merge: ea103fe 88ae058
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 16 09:46:04 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 16 09:46:04 2013 -0400

    Merge topic 'cleanup-CTestTestMemcheck' into next
    
    88ae058 CTestTestMemcheck: Tolerate trailing "==..." lines from valgrind


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=88ae0582540a5fdcd04bb3746b0f70b81336fc4e
commit 88ae0582540a5fdcd04bb3746b0f70b81336fc4e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 16 08:50:41 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 16 09:44:37 2013 -0400

    CTestTestMemcheck: Tolerate trailing "==..." lines from valgrind
    
    When tests
    
     CTestTestMemcheckDummyPurify
     CTestTestMemcheckDummyValgrind
     CTestTestMemcheckDummyValgrindPrePost
     CTestTestMemcheckDummyValgrindIgnoreMemcheck
    
    run inside a "ctest -T Memcheck" the parent valgrind may add extra lines
    starting with "==" to the end of the output.  Tolerate this without
    failing.

diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt
index 57e8e08..acfe0b0 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -46,8 +46,8 @@ endif ()
 # When this entire test runs under coverage or memcheck tools
 # they may add output to the end, so match known cases:
 #  - Bullseye adds a "BullseyeCoverage..." line.
-#  - Valgrind memcheck may add extra newlines and tabs.
-set(OTHER_TOOL_OUTPUT "(BullseyeCoverage[^\n]*\n|[\t\n]+)?")
+#  - Valgrind memcheck may add extra "==..." lines.
+set(OTHER_TOOL_OUTPUT "((BullseyeCoverage|==)[^\n]*\n)*")
 
 function(gen_mc_test_internal NAME CHECKER)
     set(SUBTEST_NAME "${NAME}")

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

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


hooks/post-receive
-- 
CMake