[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3922-g6abd617
Brad King
brad.king at kitware.com
Fri Aug 16 16:18:14 EDT 2013
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 6abd6179cf6f3266c305c8a40f3d4d04e346941b (commit)
via 8ea62fdf302e1e499075db50412fbe80b1115fd9 (commit)
via f169f48f93b12a9b2bce9e8c23fc66e7e3ee8c9e (commit)
from 59c0f980829a3f5a5ed87edc2264657670a3f6dd (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=6abd6179cf6f3266c305c8a40f3d4d04e346941b
commit 6abd6179cf6f3266c305c8a40f3d4d04e346941b
Merge: 59c0f98 8ea62fd
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 16 16:18:13 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 16 16:18:13 2013 -0400
Merge topic 'cleanup-CTestTestMemcheck' into next
8ea62fd CTestTestMemcheck: Tolerate trailing "==..." lines from valgrind
f169f48 CTestTestMemcheck: Refactor output expectation regex generation
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ea62fdf302e1e499075db50412fbe80b1115fd9
commit 8ea62fdf302e1e499075db50412fbe80b1115fd9
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 16:16:27 2013 -0400
CTestTestMemcheck: Tolerate trailing "==..." lines from valgrind
diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt
index 8a61710..d595c98 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -49,7 +49,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.
-set(other_tool_output "((${guard_malloc_output}BullseyeCoverage)[^\n]*\n)*")
+# - Valgrind memcheck may add extra "==..." lines.
+set(other_tool_output "((${guard_malloc_output}BullseyeCoverage|==)[^\n]*\n)*")
string(REPLACE "\r\n" "\n" ctest_and_tool_outputs "
1/1 MemCheck #1: RunCMake \\.+ Passed +[0-9]+\\.[0-9]+ sec
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f169f48f93b12a9b2bce9e8c23fc66e7e3ee8c9e
commit f169f48f93b12a9b2bce9e8c23fc66e7e3ee8c9e
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 16:16:27 2013 -0400
CTestTestMemcheck: Refactor output expectation regex generation
Refactor generation of PASS_REGULAR_EXPRESSION for tests
CTestTestMemcheckDummyPurify
CTestTestMemcheckDummyValgrind
CTestTestMemcheckDummyValgrindPrePost
CTestTestMemcheckDummyValgrindIgnoreMemcheck
Avoid duplicating the normal ctest output matching expression. Use
literal newlines instead of "\n" to improve readability. Integrate
matching of guard-malloc lines at the end of the output with expressions
matching tool output like lines for BullseyeCoverage.
diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt
index 86d7385..8a61710 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -35,14 +35,30 @@ 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 ()
-set(BULLSEYE_MSG "(BullseyeCoverage[^\n]*\n)?")
+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.
+set(other_tool_output "((${guard_malloc_output}BullseyeCoverage)[^\n]*\n)*")
+
+string(REPLACE "\r\n" "\n" 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}")
@@ -146,7 +162,7 @@ set_tests_properties(CTestTestMemcheckDummyValgrind
CTestTestMemcheckDummyValgrindPrePost
CTestTestMemcheckDummyPurify
PROPERTIES
- PASS_REGULAR_EXPRESSION "${NORMAL_CTEST_OUTPUT}${BULLSEYE_MSG}$")
+ PASS_REGULAR_EXPRESSION "${ctest_and_tool_outputs}$")
foreach (_pp Pre Post)
string(TOLOWER ${_pp} _pp_lower)
@@ -157,7 +173,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 .*${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:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list