[Cmake-commits] CMake branch, next, updated. v3.1.1-2350-g19a24c0

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  19a24c0387819644e016194ce653946d772762b2 (commit)
       via  d5604fc8008d0a86046d004914a6531b0cd940b9 (commit)
      from  f4e833c32a97a87918a463d5e234a76d993fdc42 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19a24c0387819644e016194ce653946d772762b2
commit 19a24c0387819644e016194ce653946d772762b2
Merge: f4e833c d5604fc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 26 13:50:08 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 26 13:50:08 2015 -0500

    Merge topic 'test-rerun-cmake' into next
    
    d5604fc8 Tests/RunCMake: Normalize newlines before checking actual output


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5604fc8008d0a86046d004914a6531b0cd940b9
commit d5604fc8008d0a86046d004914a6531b0cd940b9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 26 13:41:38 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 26 13:41:38 2015 -0500

    Tests/RunCMake: Normalize newlines before checking actual output
    
    We read the expected output with file(STRINGS) which converts CRLF
    newlines to LF.  Do the same with the actual output before comparing.

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} "")

-----------------------------------------------------------------------

Summary of changes:
 Tests/RunCMake/RunCMake.cmake |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake