diff options
| author | Brad King <brad.king@kitware.com> | 2015-09-17 13:08:30 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-09-17 14:20:58 (GMT) |
| commit | 1a75a966503c6aa76a564e23c4cf3695c4afc1ea (patch) | |
| tree | bfaedc48349f8849004d962238da56391ada6a65 /Tests/RunCMake/RunCMake.cmake | |
| parent | fa73ee025fb979fe8668483ca04f8be8f69b2f5b (diff) | |
| download | CMake-1a75a966503c6aa76a564e23c4cf3695c4afc1ea.zip CMake-1a75a966503c6aa76a564e23c4cf3695c4afc1ea.tar.gz CMake-1a75a966503c6aa76a564e23c4cf3695c4afc1ea.tar.bz2 | |
Tests: Teach RunCMake to tolerate 'Time Machine' lines in test output
On some OS X machines some tests get lines on stderr of the form:
... attempting to exclude an item from Time Machine by path ...
produced by the system. Remove such lines from output before matching
because they are not representative of the actual test output.
Diffstat (limited to 'Tests/RunCMake/RunCMake.cmake')
| -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..ffb3e50 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]*\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}) |