Merge topic 'test-RunCMake-exclude-more-output'
f38625be
Tests: Teach RunCMake to tolerate 'Bullseye Testing' lines in test output1a75a966
Tests: Teach RunCMake to tolerate 'Time Machine' lines in test output
This commit is contained in:
commit
b3c176b7db
|
@ -102,7 +102,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|[a-z]+\\([0-9]+\\) malloc:|Error kstat returned)[^\n]*\n)+" "\\1" actual_std${o} "${actual_std${o}}")
|
||||
string(REGEX REPLACE "(^|\n)((==[0-9]+==|BullseyeCoverage|[a-z]+\\([0-9]+\\) malloc:|Error kstat returned|[^\n]*from Time Machine by path|[^\n]*Bullseye Testing Technology)[^\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})
|
||||
|
|
Loading…
Reference in New Issue