[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3912-g5158667

[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  51586671ce830b4525d6f2181643b65cffd2e580 (commit)
       via  43bcd889a293a684162ec07b4be874187fcf3327 (commit)
      from  255472dcb110e88def1652c6a61d4c073687e257 (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=51586671ce830b4525d6f2181643b65cffd2e580
commit 51586671ce830b4525d6f2181643b65cffd2e580
Merge: 255472d 43bcd88
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 16 11:37:09 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 16 11:37:09 2013 -0400

    Merge topic 'cleanup-CTestTestMemcheck' into next
    
    43bcd88 CTestTestMemcheck: Refactor output expectation regex generation


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43bcd889a293a684162ec07b4be874187fcf3327
commit 43bcd889a293a684162ec07b4be874187fcf3327
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 16 11:19:08 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 16 11:23:36 2013 -0400

    CTestTestMemcheck: Refactor output expectation regex generation

diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt
index acfe0b0..e721506 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -35,19 +35,31 @@ target_link_libraries(memcheck_fail CMakeLib)
 # same filenames.
 add_subdirectory(NoLogDummyChecker)
 
-if (APPLE)
-    # filter out additional messages by Guard Malloc integrated in Xcode
-    set(GUARD_MALLOC_MSG "(ctest\([0-9]+\) malloc: [^\n]*\n)*")
-    set(NORMAL_CTEST_OUTPUT "\n1/1 MemCheck #1: RunCMake \\.+   Passed +[0-9]+\\.[0-9]+ sec\n${GUARD_MALLOC_MSG}\n${GUARD_MALLOC_MSG}100% tests passed, 0 tests failed out of 1\n.*\n-- Processing memory checking output: \n${GUARD_MALLOC_MSG}Memory checking results:\n${GUARD_MALLOC_MSG}")
-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 ()
+if(APPLE)
+  # filter out additional messages by Guard Malloc integrated in Xcode
+  set(guard_malloc_msg "ctest\([0-9]+\) malloc: ")
+  set(guard_malloc_lines "(${guard_malloc_msg}[^\n]*\n)*")
+  set(guard_malloc_output "${guard_malloc_msg}|")
+else()
+  set(guard_malloc_msg "")
+  set(guard_malloc_lines "")
+  set(guard_malloc_output "")
+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 "==..." lines.
-set(OTHER_TOOL_OUTPUT "((BullseyeCoverage|==)[^\n]*\n)*")
+set(other_tool_output "((${guard_malloc_output}BullseyeCoverage|==)[^\n]*\n)*")
+
+set(ctest_and_tool_outputs "
+1/1 MemCheck #1: RunCMake \\.+   Passed +[0-9]+\\.[0-9]+ sec
+${guard_malloc_lines}
+100% tests passed, 0 tests failed out of 1
+.*
+-- Processing memory checking output:( )
+${guard_malloc_lines}Memory checking results:
+${other_tool_output}")
 
 function(gen_mc_test_internal NAME CHECKER)
     set(SUBTEST_NAME "${NAME}")
@@ -151,7 +163,7 @@ set_tests_properties(CTestTestMemcheckDummyValgrind
                      CTestTestMemcheckDummyValgrindPrePost
                      CTestTestMemcheckDummyPurify
     PROPERTIES
-    PASS_REGULAR_EXPRESSION "${NORMAL_CTEST_OUTPUT}${OTHER_TOOL_OUTPUT}$")
+    PASS_REGULAR_EXPRESSION "${ctest_and_tool_outputs}$")
 
 foreach (_pp Pre Post)
     string(TOLOWER ${_pp} _pp_lower)
@@ -162,7 +174,7 @@ endforeach ()
 
 set_tests_properties(CTestTestMemcheckDummyValgrindIgnoreMemcheck
     PROPERTIES
-    PASS_REGULAR_EXPRESSION "\n2/2 Test #2: RunCMakeAgain .*${NORMAL_CTEST_OUTPUT}${OTHER_TOOL_OUTPUT}$")
+    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")

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

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


hooks/post-receive
-- 
CMake