summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-02-20 14:02:21 (GMT)
committerBrad King <brad.king@kitware.com>2015-02-23 15:01:57 (GMT)
commit57f2aa7c37e3e4d09a43c6790772d11d5b63e9a6 (patch)
tree1d8049396ec7892edb549d07b3cce181ed797af7
parentb04c8ec3f840a5cb34a97b2fe8417882b49b3820 (diff)
downloadCMake-57f2aa7c37e3e4d09a43c6790772d11d5b63e9a6.zip
CMake-57f2aa7c37e3e4d09a43c6790772d11d5b63e9a6.tar.gz
CMake-57f2aa7c37e3e4d09a43c6790772d11d5b63e9a6.tar.bz2
Tests: Teach RunCMake to tolerate BullseyeCoverage lines in test output
When RunCMake tests run under dynamic analysis, Bullseye may add lines of the form "BullseyeCoverage..." to the output. Remove such lines from the actual output before matching it against the expected output.
-rw-r--r--Tests/RunCMake/RunCMake.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index 6389ef4..ffa1e2b 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -83,7 +83,7 @@ function(run_cmake test)
endif()
foreach(o out err)
string(REGEX REPLACE "\r\n" "\n" actual_std${o} "${actual_std${o}}")
- string(REGEX REPLACE "(^|\n)(==[0-9]+==[^\n]*\n)+" "\\1" actual_std${o} "${actual_std${o}}")
+ string(REGEX REPLACE "(^|\n)((==[0-9]+==|BullseyeCoverage)[^\n]*\n)+" "\\1" actual_std${o} "${actual_std${o}}")
string(REGEX REPLACE "\n+$" "" actual_std${o} "${actual_std${o}}")
set(expect_${o} "")
if(DEFINED expect_std${o})