From 8ea62fdf302e1e499075db50412fbe80b1115fd9 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 16 Aug 2013 09:39:52 -0400 Subject: CTestTestMemcheck: Tolerate trailing "==..." lines from valgrind --- Tests/CTestTestMemcheck/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v0.12