[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3902-gb80865f

[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  b80865fbcde1d85542620444c22b8a66605cbbdf (commit)
       via  67e45711e8fba4fe3fe38a451a67ad7a5c2047cc (commit)
      from  4232d498f61fc0389c010bf9d1b3b964c5352985 (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=b80865fbcde1d85542620444c22b8a66605cbbdf
commit b80865fbcde1d85542620444c22b8a66605cbbdf
Merge: 4232d49 67e4571
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 15 15:22:03 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 15 15:22:03 2013 -0400

    Merge topic 'cleanup-CTestTestMemcheck' into next
    
    67e4571 CTestTestMemcheck: Tolerate trailing newlines and tabs from valgrind


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67e45711e8fba4fe3fe38a451a67ad7a5c2047cc
commit 67e45711e8fba4fe3fe38a451a67ad7a5c2047cc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 15 15:16:41 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 15 15:19:53 2013 -0400

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

diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt
index 86d7385..57e8e08 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 newlines and tabs.
+set(OTHER_TOOL_OUTPUT "(BullseyeCoverage[^\n]*\n|[\t\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:
 Tests/CTestTestMemcheck/CMakeLists.txt |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake