diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-07 19:43:41 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-07 19:43:41 (GMT) |
| commit | e25dabb3d535807526609b42b988c82bab1454de (patch) | |
| tree | 323db4a33d5799c92e2ef89466edfb3a73c822e4 | |
| parent | 64064c6616a64380d7f30173abb0db70973fb4da (diff) | |
| parent | 49533303a5dd46b5eea04947849e1a31e859fb83 (diff) | |
| download | CMake-e25dabb3d535807526609b42b988c82bab1454de.zip CMake-e25dabb3d535807526609b42b988c82bab1454de.tar.gz CMake-e25dabb3d535807526609b42b988c82bab1454de.tar.bz2 | |
Merge topic 'RunCMake-ignore-valgrind-lines'
4953330 Tests/RunCMake: Tolerate valgrind lines in CMake output
| -rw-r--r-- | Tests/RunCMake/RunCMake.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake index 00faa4c..f770c93 100644 --- a/Tests/RunCMake/RunCMake.cmake +++ b/Tests/RunCMake/RunCMake.cmake @@ -52,6 +52,7 @@ function(run_cmake test) set(msg "${msg}Result is [${actual_result}], not [${expect_result}].\n") endif() 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}}") set(expect_${o} "") if(DEFINED expect_std${o}) |