From 69de0f7ea4163f350dd6683b6d7f47377157ae7d Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 20 Feb 2015 09:05:22 -0500 Subject: 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 "() malloc:..." to the output. Remove such lines from the actual output before matching it against the expected output. --- Tests/RunCMake/RunCMake.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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}) -- cgit v0.12