kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'RunCMake-ignore-valgrind-lines' 

4953330 Tests/RunCMake: Tolerate valgrind lines in CMake output
This commit is contained in:
Brad King 2013-10-07 15:43:41 -04:00 committed by CMake Topic Stage
parent 64064c6616 49533303a5
commit e25dabb3d5
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Tests/RunCMake/RunCMake.cmake
View File

@ -52,6 +52,7 @@ function(run_cmake test)
set(msg "${msg}Result is [${actual_result}], not [${expect_result}].\n") set(msg "${msg}Result is [${actual_result}], not [${expect_result}].\n")
endif() endif()
foreach(o out err) foreach(o out err)
string(REGEX REPLACE "(^|\n)(==[0-9]+==[^\n]*\n)+" "\\1" actual_std${o} "${actual_std${o}}")
string(REGEX REPLACE "\n+$" "" actual_std${o} "${actual_std${o}}") string(REGEX REPLACE "\n+$" "" actual_std${o} "${actual_std${o}}")
set(expect_${o} "") set(expect_${o} "")
if(DEFINED expect_std${o}) if(DEFINED expect_std${o})