summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-08-16 13:39:52 (GMT)
committerBrad King <brad.king@kitware.com>2013-08-16 20:16:27 (GMT)
commit8ea62fdf302e1e499075db50412fbe80b1115fd9 (patch)
tree990de476088ab88e7ab6b9f34540df234a887239 /Tests
parentf169f48f93b12a9b2bce9e8c23fc66e7e3ee8c9e (diff)
downloadCMake-8ea62fdf302e1e499075db50412fbe80b1115fd9.zip
CMake-8ea62fdf302e1e499075db50412fbe80b1115fd9.tar.gz
CMake-8ea62fdf302e1e499075db50412fbe80b1115fd9.tar.bz2
CTestTestMemcheck: Tolerate trailing "==..." lines from valgrind
Diffstat (limited to 'Tests')
-rw-r--r--Tests/CTestTestMemcheck/CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
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