[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3910-g255472d

[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  255472dcb110e88def1652c6a61d4c073687e257 (commit)
       via  8f0bb35006b9fb03a8615ea9e9f512c7cc19eb7a (commit)
      from  f18c2418e3885c65f9412d2af698e976f41cd941 (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=255472dcb110e88def1652c6a61d4c073687e257
commit 255472dcb110e88def1652c6a61d4c073687e257
Merge: f18c241 8f0bb35
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 16 09:46:28 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 16 09:46:28 2013 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f0bb35006b9fb03a8615ea9e9f512c7cc19eb7a
commit 8f0bb35006b9fb03a8615ea9e9f512c7cc19eb7a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 16 09:39:52 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 16 09:39:52 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 86d7385..acfe0b0 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -42,7 +42,12 @@ if (APPLE)
 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)?")
+
+# 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 "==..." lines.
+set(OTHER_TOOL_OUTPUT "((BullseyeCoverage|==)[^\n]*\n)*")
 
 function(gen_mc_test_internal NAME CHECKER)
     set(SUBTEST_NAME "${NAME}")
@@ -146,7 +151,7 @@ set_tests_properties(CTestTestMemcheckDummyValgrind
                      CTestTestMemcheckDummyValgrindPrePost
                      CTestTestMemcheckDummyPurify
     PROPERTIES
-    PASS_REGULAR_EXPRESSION "${NORMAL_CTEST_OUTPUT}${BULLSEYE_MSG}$")
+    PASS_REGULAR_EXPRESSION "${NORMAL_CTEST_OUTPUT}${OTHER_TOOL_OUTPUT}$")
 
 foreach (_pp Pre Post)
     string(TOLOWER ${_pp} _pp_lower)
@@ -157,7 +162,7 @@ endforeach ()
 
 set_tests_properties(CTestTestMemcheckDummyValgrindIgnoreMemcheck
     PROPERTIES
-    PASS_REGULAR_EXPRESSION "\n2/2 Test #2: RunCMakeAgain .*${NORMAL_CTEST_OUTPUT}${BULLSEYE_MSG}$")
+    PASS_REGULAR_EXPRESSION "\n2/2 Test #2: RunCMakeAgain .*${NORMAL_CTEST_OUTPUT}${OTHER_TOOL_OUTPUT}$")
 
 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")

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

Summary of changes:


hooks/post-receive
-- 
CMake