diff options
| author | Brad King <brad.king@kitware.com> | 2015-09-18 13:56:34 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-09-18 13:56:34 (GMT) |
| commit | b3c176b7dbceb2c4e34489cd97ad6c929819ce62 (patch) | |
| tree | ef520ecb7b11bf5eaf8115e6cf74192f20f0c7d2 /Tests/RunCMake | |
| parent | 0d5605120bd88c40878ef8248f47889ea2321e6d (diff) | |
| parent | f38625be7a6284495d3617bc64725f2873284b01 (diff) | |
| download | CMake-b3c176b7dbceb2c4e34489cd97ad6c929819ce62.zip CMake-b3c176b7dbceb2c4e34489cd97ad6c929819ce62.tar.gz CMake-b3c176b7dbceb2c4e34489cd97ad6c929819ce62.tar.bz2 | |
Merge topic 'test-RunCMake-exclude-more-output'
f38625be Tests: Teach RunCMake to tolerate 'Bullseye Testing' lines in test output
1a75a966 Tests: Teach RunCMake to tolerate 'Time Machine' lines in test output
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/RunCMake.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake index 46bc494..e2ad503 100644 --- a/Tests/RunCMake/RunCMake.cmake +++ b/Tests/RunCMake/RunCMake.cmake @@ -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}) |