Browse Source

Tests/RunCMake: Tolerate valgrind lines in CMake output

When RunCMake tests run during dynamic analysis, valgrind may add lines
of the form "==[0-9]+==..." to the output.  Remove such lines from the
actual output before matching it against the expected output.
Brad King 12 years ago
parent
commit
49533303a5
1 changed files with 1 additions and 0 deletions
  1. 1 0
      Tests/RunCMake/RunCMake.cmake

+ 1 - 0
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})