diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-27 16:22:04 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-01-27 16:22:04 (GMT) |
| commit | 34ce0dd22f1c2091c5870e25677b100f753c44a0 (patch) | |
| tree | 10b1cf4f65932a9b5a7cd6038674a534bf5c650e /Tests | |
| parent | d1b3370d5210d4262e58a523d19393e9ea9ee782 (diff) | |
| parent | bf05938b8f186c397c918c1cf8bd9ce853c86123 (diff) | |
| download | CMake-34ce0dd22f1c2091c5870e25677b100f753c44a0.zip CMake-34ce0dd22f1c2091c5870e25677b100f753c44a0.tar.gz CMake-34ce0dd22f1c2091c5870e25677b100f753c44a0.tar.bz2 | |
Merge topic 'tests-RunCMake-normalize-newlines'
bf05938b Tests/RunCMake: Normalize newlines before checking actual output
Diffstat (limited to 'Tests')
| -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 23f2f97..33b745d 100644 --- a/Tests/RunCMake/RunCMake.cmake +++ b/Tests/RunCMake/RunCMake.cmake @@ -79,6 +79,7 @@ function(run_cmake test) set(msg "${msg}Result is [${actual_result}], not [${expect_result}].\n") endif() foreach(o out err) + string(REGEX REPLACE "\r\n" "\n" actual_std${o} "${actual_std${o}}") 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} "") |