diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-20 14:05:22 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-02-23 15:01:57 (GMT) |
| commit | 69de0f7ea4163f350dd6683b6d7f47377157ae7d (patch) | |
| tree | 8718f66b907ec112bac4cffb414714f158e0ceb5 | |
| parent | 57f2aa7c37e3e4d09a43c6790772d11d5b63e9a6 (diff) | |
| download | CMake-69de0f7ea4163f350dd6683b6d7f47377157ae7d.zip CMake-69de0f7ea4163f350dd6683b6d7f47377157ae7d.tar.gz CMake-69de0f7ea4163f350dd6683b6d7f47377157ae7d.tar.bz2 | |
Tests: Teach RunCMake to tolerate Guard Malloc lines in test output
When RunCMake tests run under Xcode Guard Malloc, Guard Malloc may add
lines of the form "<tool>(<pid>) malloc:..." to the output. Remove such
lines from the actual output before matching it against the expected
output.
| -rw-r--r-- | Tests/RunCMake/RunCMake.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake index ffa1e2b..3ad1bab 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]+==|BullseyeCoverage)[^\n]*\n)+" "\\1" actual_std${o} "${actual_std${o}}") + string(REGEX REPLACE "(^|\n)((==[0-9]+==|BullseyeCoverage|[a-z]+\\([0-9]+\\) malloc:)[^\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}) |