diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-20 14:12:47 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-02-23 15:01:58 (GMT) |
| commit | 7ce9f6e29ee143d2a63d55354c00d5ea50d6d0d1 (patch) | |
| tree | e183dcfeef542103b9b61626ecfa420c704ff220 | |
| parent | 69de0f7ea4163f350dd6683b6d7f47377157ae7d (diff) | |
| download | CMake-7ce9f6e29ee143d2a63d55354c00d5ea50d6d0d1.zip CMake-7ce9f6e29ee143d2a63d55354c00d5ea50d6d0d1.tar.gz CMake-7ce9f6e29ee143d2a63d55354c00d5ea50d6d0d1.tar.bz2 | |
Tests: Teach RunCMake to tolerate 'Error kstat returned' lines in test output
When RunCMake tests run on Solaris, the output may contain unexpected
lines of the form "Error kstat returned...". These lines are printed by
SystemInformationImplementation::RunProcess when called from
SystemInformationImplementation::ParseValueFromKStat (see issue #12066).
Until someone investigates why kstat returns values outside the range it
documents, simply remove such lines from the actual output before
matching it against the expected output.
| -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 3ad1bab..abac66e 100644 --- a/Tests/RunCMake/RunCMake.cmake +++ b/Tests/RunCMake/RunCMake.cmake @@ -83,7 +83,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:)[^\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]*\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}) |